Merge pull request #158 from maxdestors/patch-1

jeremykenedy · web-flow · commit ddd9b32db695 · 2023-04-05T19:44:51.000-07:00
Fix Version compare with laravel 10
diff --git a/src/App/Models/Activity.php b/src/App/Models/Activity.php
@@ -125,7 +125,7 @@ public function user()
     public static function rules($merge = [])
     {
         if (app() instanceof \Illuminate\Foundation\Application) {
-            $route_url_check = \Illuminate\Foundation\Application::VERSION < 5.8 ? 'active_url' : 'url';
+            $route_url_check = version_compare(\Illuminate\Foundation\Application::VERSION, '5.8') < 0 ? 'active_url' : 'url';
         } else {
             $route_url_check = 'url';
         }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function user()`
`125`	`125`	`public static function rules($merge = [])`
`126`	`126`	`{`
`127`	`127`	`if (app() instanceof \Illuminate\Foundation\Application) {`
`128`		`- $route_url_check = \Illuminate\Foundation\Application::VERSION < 5.8 ? 'active_url' : 'url';`
	`128`	`+ $route_url_check = version_compare(\Illuminate\Foundation\Application::VERSION, '5.8') < 0 ? 'active_url' : 'url';`
`129`	`129`	`} else {`
`130`	`130`	`$route_url_check = 'url';`
`131`	`131`	`}`