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

Merge remote branch 'udat/router/empty-string-as-default-parameter-value'

Browse Source
This commit is contained in:
Fabien Potencier 2011-03-14 13:43:59 +01:00
commit ef87ca3d75
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Routing/RouteCompiler.php
View File

@ -212,7 +212,7 @@ class RouteCompiler implements RouteCompilerInterface
$this->segments[] = preg_quote($separator, '#').'(?P<'.$variable.'>'.$requirement.')'; $this->segments[] = preg_quote($separator, '#').'(?P<'.$variable.'>'.$requirement.')';
$this->variables[$variable] = $name; $this->variables[$variable] = $name;
if (!$this->route->getDefault($variable)) { if (null === $this->route->getDefault($variable)) {
$this->firstOptional = count($this->segments); $this->firstOptional = count($this->segments);
} }
} }

2
tests/Symfony/Tests/Component/Routing/RouteCompilerTest.php
View File

@ -69,7 +69,7 @@ class RouteCompilerTest extends \PHPUnit_Framework_TestCase
array( array(
'Route with several variables that have default values', 'Route with several variables that have default values',
array('/foo/{bar}/{foobar}', array('bar' => 'bar', 'foobar' => 'foobar')), array('/foo/{bar}/{foobar}', array('bar' => 'bar', 'foobar' => '')),
'/foo', '#^/foo(?:/(?P<bar>[^/\.]+?) (?:/(?P<foobar>[^/\.]+?) )?)?$#x', array('bar' => '{bar}', 'foobar' => '{foobar}'), array( '/foo', '#^/foo(?:/(?P<bar>[^/\.]+?) (?:/(?P<foobar>[^/\.]+?) )?)?$#x', array('bar' => '{bar}', 'foobar' => '{foobar}'), array(
array('variable', '/', '{foobar}', 'foobar'), array('variable', '/', '{foobar}', 'foobar'),
array('variable', '/', '{bar}', 'bar'), array('variable', '/', '{bar}', 'bar'),