cascade route configuration for embedded route collection

silexphp · Jun 12, 2015 · 48727b4 · 48727b4
1 parent cfb6ed0
commit 48727b4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/Silex/ControllerCollection.php b/src/Silex/ControllerCollection.php
@@ -171,9 +171,7 @@ public function __call($method, $arguments)
         call_user_func_array(array($this->defaultRoute, $method), $arguments);
 
         foreach ($this->controllers as $controller) {
-            if ($controller instanceof Controller) {
-                call_user_func_array(array($controller, $method), $arguments);
-            }
+            call_user_func_array(array($controller, $method), $arguments);
         }
 
         return $this;

diff --git a/tests/Silex/Tests/ControllerCollectionTest.php b/tests/Silex/Tests/ControllerCollectionTest.php
@@ -176,6 +176,24 @@ public function testRouteMethodDoesNotExist()
         $controller = new ControllerCollection($route);
         $controller->bar();
     }
+
+    public function testNestedCollectionRouteCallbacks()
+    {
+        $cl1 = new ControllerCollection(new MyRoute1());
+        $cl2 = new ControllerCollection(new MyRoute1());
+
+        $c1 = $cl2->match('/c1', function () {});
+        $cl1->mount('/foo', $cl2);
+        $c2 = $cl2->match('/c2', function () {});
+        $cl1->before('before');
+        $c3 = $cl2->match('/c3', function () {});
+
+        $cl1->flush();
+
+        $this->assertEquals(array('before'), $c1->getRoute()->getOption('_before_middlewares'));
+        $this->assertEquals(array('before'), $c2->getRoute()->getOption('_before_middlewares'));
+        $this->assertEquals(array('before'), $c3->getRoute()->getOption('_before_middlewares'));
+    }
 }
 
 class MyRoute1 extends Route