Merge pull request #108 from ibrahimMahfuz/master

jeremykenedy · web-flow · commit a9b77c0575ba · 2020-10-27T09:56:21.000-07:00
Lumen 8 Activity Rule Support
diff --git a/src/App/Models/Activity.php b/src/App/Models/Activity.php
@@ -125,8 +125,8 @@ public function user()
      */
     public static function rules($merge = [])
     {
-        if (\Illuminate\Foundation\Application::VERSION < 5.8) {
-            $route_url_check = 'active_url';
+        if (app() instanceof \Illuminate\Foundation\Application) {
+            $route_url_check = \Illuminate\Foundation\Application::VERSION < 5.8 ? 'active_url' : 'url';
         } else {
             $route_url_check = 'url';
         }

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