Merge branch '2.1'
* 2.1: [FrameworkBundle] Router skip defaults resolution for arrays Conflicts: src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
This commit is contained in:
commit
224d6b7925
@ -173,7 +173,7 @@ class RoutingTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
public function getNonStringValues()
|
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)
|
private function getServiceContainer(RouteCollection $routes)
|
||||||
|
Reference in New Issue
Block a user