From 208e1349451ac9f3336bcae1cad8e5e9382db48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20H=C3=A9rault?= Date: Tue, 6 Nov 2012 16:30:03 +0100 Subject: [PATCH] [FrameworkBundle] Router skip defaults resolution for arrays --- src/Symfony/Bundle/FrameworkBundle/Routing/Router.php | 2 +- src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index aae30dbcd5..8d50592af0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -114,7 +114,7 @@ class Router extends BaseRouter implements WarmableInterface { $container = $this->container; - if (null === $value || false === $value || true === $value || is_object($value)) { + if (null === $value || false === $value || true === $value || is_object($value) || is_array($value)) { return $value; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php index 2c6a031b69..6fc709a7e1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php @@ -163,7 +163,7 @@ class RoutingTest extends \PHPUnit_Framework_TestCase public function getNonStringValues() { - return array(array(null), array(false), array(true), array(new \stdClass()), array(array('foo', 'bar'))); + return array(array(null), array(false), array(true), array(new \stdClass()), array(array('foo', 'bar')), array(array(array()))); } private function getServiceContainer(RouteCollection $routes)