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

[Routing] fixed URL generation when an optional variable value is 0

Browse Source
This commit is contained in:
Fabien Potencier 2011-04-26 09:50:57 +02:00
parent 035afc1f4e
commit fefee0d5e5
2 changed files with 9 additions and 1 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

@ -110,7 +110,7 @@ class UrlGenerator implements UrlGeneratorInterface
throw new \InvalidArgumentException(sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $tparams[$token[3]]));
}
if ($tparams[$token[3]] || !$optional) {
if (!in_array($tparams[$token[3]], array(null, '', false), true) || !$optional) {
// %2F is not valid in a URL, so we don't encode it (which is fine as the requirements explicitly allowed it)
$url = $token[1].str_replace('%2F', '/', urlencode($tparams[$token[3]])).$url;
}

8
tests/Symfony/Tests/Component/Routing/Generator/UrlGeneratorTest.php
View File

@ -82,6 +82,14 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('/app.php/testing//bar', $url);
}
public function testRelativeUrlWithOptionalZeroParameter()
{
$routes = $this->getRoutes('test', new Route('/testing/{page}'));
$url = $this->getGenerator($routes)->generate('test', array('page' => 0), false);
$this->assertEquals('/app.php/testing/0', $url);
}
public function testRelativeUrlWithExtraParameters()
{
$routes = $this->getRoutes('test', new Route('/testing'));