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

[FrameworkBundle] recursively resolve container parameter placeholders

Browse Source 
for arrays in router _defaults
This commit is contained in:
Klein Florian 2012-07-20 14:59:54 +02:00
parent 9f157a1616
commit 4b867654c6
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
View File

@ -114,6 +114,14 @@ class Router extends BaseRouter implements WarmableInterface
{ {
$container = $this->container; $container = $this->container;
if (is_array($value)) {
foreach ($value as $key => $val) {
$value[$key] = $this->resolveString($val);
}
return $value;
}
if (null === $value || false === $value || true === $value || is_object($value)) { if (null === $value || false === $value || true === $value || is_object($value)) {
return $value; return $value;
} }

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

@ -27,6 +27,8 @@ class RoutingTest extends \PHPUnit_Framework_TestCase
'foo' => 'before_%parameter.foo%', 'foo' => 'before_%parameter.foo%',
'bar' => '%parameter.bar%_after', 'bar' => '%parameter.bar%_after',
'baz' => '%%unescaped%%', 'baz' => '%%unescaped%%',
'boo' => array('%parameter%', '%%escaped_parameter%%', array('%bee_parameter%', 'bee')),
'bee' => array('bee', 'bee'),
), ),
array( array(
) )
@ -39,6 +41,12 @@ class RoutingTest extends \PHPUnit_Framework_TestCase
$sc->expects($this->at(3))->method('hasParameter')->will($this->returnValue(true)); $sc->expects($this->at(3))->method('hasParameter')->will($this->returnValue(true));
$sc->expects($this->at(4))->method('getParameter')->will($this->returnValue('bar')); $sc->expects($this->at(4))->method('getParameter')->will($this->returnValue('bar'));
$sc->expects($this->at(5))->method('hasParameter')->will($this->returnValue(true));
$sc->expects($this->at(6))->method('getParameter')->will($this->returnValue('boo'));
$sc->expects($this->at(7))->method('hasParameter')->will($this->returnValue(true));
$sc->expects($this->at(8))->method('getParameter')->will($this->returnValue('foo_bee'));
$router = new Router($sc, 'foo'); $router = new Router($sc, 'foo');
$route = $router->getRouteCollection()->get('foo'); $route = $router->getRouteCollection()->get('foo');
@ -47,6 +55,8 @@ class RoutingTest extends \PHPUnit_Framework_TestCase
'foo' => 'before_foo', 'foo' => 'before_foo',
'bar' => 'bar_after', 'bar' => 'bar_after',
'baz' => '%unescaped%', 'baz' => '%unescaped%',
'boo' => array('boo', '%escaped_parameter%', array('foo_bee', 'bee')),
'bee' => array('bee', 'bee'),
), ),
$route->getDefaults() $route->getDefaults()
); );