diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1'

Browse Source 
* 2.1:
  [FrameworkBundle] Router skip defaults resolution for arrays

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
This commit is contained in:
Fabien Potencier 2012-11-07 07:48:28 +01:00
commit 224d6b7925
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
View File

@ -173,7 +173,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)