bug #24304 [FrameworkBundle] Fix Routing\DelegatingLoader (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 4129fd2a83d8 · 2017-09-25T11:27:18.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle] Fix Routing\DelegatingLoader | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Spotted while reviewing: the default controller is not always a string, so parsing should only be done conditionally. Commits ------- a69c1b2 [FrameworkBundle] Fix Routing\DelegatingLoader
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -85,7 +85,7 @@ public function load($resource, $type = null)
         $this->loading = false;
 
         foreach ($collection->all() as $route) {
-            if (!$controller = $route->getDefault('_controller')) {
+            if (!is_string($controller = $route->getDefault('_controller')) || !$controller) {
                 continue;
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
@@ -44,3 +44,7 @@ fragment_home:
 fragment_inlined:
     path:     /fragment_inlined
     defaults: { _controller: TestBundle:Fragment:inlined }
+
+array_controller:
+    path:     /array_controller
+    defaults: { _controller: [ArrayController, someAction] }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function load($resource, $type = null)`
`85`	`85`	`$this->loading = false;`
`86`	`86`
`87`	`87`	`foreach ($collection->all() as $route) {`
`88`		`- if (!$controller = $route->getDefault('_controller')) {`
	`88`	`+ if (!is_string($controller = $route->getDefault('_controller')) \|\| !$controller) {`
`89`	`89`	`continue;`
`90`	`90`	`}`
`91`	`91`