follow Router changes in Laravel5.2�

mawenpei · Jan 22, 2016 · 59b7016 · 59b7016
1 parent 259f5e2
commit 59b7016
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/config/laravelfly.example.php b/config/laravelfly.example.php
@@ -34,8 +34,9 @@
             // 'currentRequest',
 
             /* depends */
-            /* Uncomment it if it's not same on each requests. Its value changed by Route::middleware */
-            // 'middleware',
+            /* Uncomment them if it's not same on each requests. Its value changed by Route::middleware */
+            // 'middleware', 
+            // 'middlewareGroups',  // only for laravel5.2+
 
             '__obj__' => [
                 'routes' => [

diff --git a/src/LaravelFly/Greedy/Routing/Router.php b/src/LaravelFly/Greedy/Routing/Router.php
@@ -11,11 +11,20 @@
 namespace LaravelFly\Greedy\Routing;
 
 use Illuminate\Routing\Route as BaseRoute;
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Container\Container;
 
 class Router extends \Illuminate\Routing\Router
 {
 
     protected $beforeAppBooted = true;
+    protected $version;
+
+    public function __construct(Dispatcher $events, Container $container = null)
+    {
+        parent::__construct($events, $container);
+        $this->version = substr($container::VERSION, 0, 3);
+    }
 
     public function appBooted()
     {
@@ -29,10 +38,25 @@ protected function newRoute($methods, $uri, $action)
     {
         if ($this->beforeAppBooted) {
             // before any request, routes are compiled auto.
-            return (new Route($methods, $uri, $action))->setContainer($this->container);
+
+            if ($this->version == '5.1') {
+                return (new Route($methods, $uri, $action))->setContainer($this->container);
+            } elseif ($this->version == '5.2') {
+                return (new Route($methods, $uri, $action))
+                    ->setRouter($this)
+                    ->setContainer($this->container);
+            }
         } else {
             // routes creaed during request are not compiled auto. They are compiled when match
-            return (new BaseRoute($methods, $uri, $action))->setContainer($this->container);
+
+            if ($this->version == '5.1') {
+                return (new BaseRoute($methods, $uri, $action))->setContainer($this->container);
+            } elseif ($this->version == '5.2') {
+                return (new BaseRoute($methods, $uri, $action))
+                    ->setRouter($this)
+                    ->setContainer($this->container);
+
+            }
         }
     }
 }