fxied group middleware bug

fastdlabs · Jan 26, 2018 · 76bd4dd · 76bd4dd
1 parent 7e9749d
commit 76bd4dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/RouteCollection.php b/src/RouteCollection.php
@@ -94,11 +94,11 @@ public function group($path, callable $callback)
         if (is_array($path)) {
             $middlewareOptions = isset($path['middleware']) ? $path['middleware'] : [];
             if (is_array($middlewareOptions)) {
-                $middleware = array_merge($middleware, $middlewareOptions);
+                $this->middleware = array_merge($this->middleware, $middlewareOptions);
             }  else {
-                $middleware[] = $middlewareOptions;
+                $this->middleware[] = $middlewareOptions;
             }
-            $path = $path['prefix'];
+            $path = isset($path['prefix']) ? $path['prefix'] : '';
         }
 
         array_push($this->with, $path);
@@ -260,7 +260,7 @@ public function addRoute($method, $path, $callback, array $defaults = [])
         $name = $path = implode('/', $this->with).$path;
 
         if (isset($this->aliasMap[$method][$name])) {
-            return $this->getRoute($name);
+            return $this->aliasMap[$method][$name];
         }
 
         $route = $this->createRoute($method, $path, $callback, $defaults);

diff --git a/tests/RouteCollectionTest.php b/tests/RouteCollectionTest.php
@@ -30,4 +30,14 @@ public function testMiddleware()
         $collection->get('/welcome', 'IndexController@welcome');
         $this->assertEmpty($collection->getRoute('/welcome')->getMiddleware());
     }
+
+    public function testGroup()
+    {
+        $collection = new RouteCollection();
+        $collection->group([
+            'middleware' => 'test1',
+        ], function ($router) {
+            $router->get('/', 'Demo@Demo')->withAddMiddleware('test');
+        });
+    }
 }