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

[Routing] fixed default value for Routes as they can be anything if they don't need to be used as default values for placeholders

Browse Source
This commit is contained in:
Fabien Potencier 2011-07-19 19:18:29 +02:00
parent dafa4d28d6
commit 9e7cb0a020
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Routing/Generator/UrlGenerator.php
View File

@ -120,7 +120,7 @@ class UrlGenerator implements UrlGeneratorInterface
$optional = true;
foreach ($tokens as $token) {
if ('variable' === $token[0]) {
if (false === $optional || !array_key_exists($token[3], $defaults) || (isset($parameters[$token[3]]) && $parameters[$token[3]] != $defaults[$token[3]])) {
if (false === $optional || !array_key_exists($token[3], $defaults) || (isset($parameters[$token[3]]) && (string) $parameters[$token[3]] != (string) $defaults[$token[3]])) {
if (!$isEmpty = in_array($tparams[$token[3]], array(null, '', false), true)) {
// check requirement
if ($tparams[$token[3]] && !preg_match('#^'.$token[2].'$#', $tparams[$token[3]])) {

4
src/Symfony/Component/Routing/Route.php
View File

@ -163,7 +163,7 @@ class Route
{
$this->defaults = array();
foreach ($defaults as $name => $default) {
$this->defaults[(string) $name] = (string) $default;
$this->defaults[(string) $name] = $default;
}
return $this;
@ -205,7 +205,7 @@ class Route
*/
public function setDefault($name, $default)
{
$this->defaults[(string) $name] = (string) $default;
$this->defaults[(string) $name] = $default;
return $this;
}

3
tests/Symfony/Tests/Component/Routing/RouteTest.php
View File

@ -65,6 +65,9 @@ class RouteTest extends \PHPUnit_Framework_TestCase
$route->setDefault('foo2', 'bar2');
$this->assertEquals('bar2', $route->getDefault('foo2'), '->getDefault() return the default value');
$this->assertNull($route->getDefault('not_defined'), '->getDefault() return null if default value is not setted');
$route->setDefault('_controller', $closure = function () { return 'Hello'; });
$this->assertEquals($closure, $route->getDefault('_controller'), '->setDefault() sets a default value');
}
public function testRequirements()