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

Revert "merged branch Tobion/strictrequirements (PR #5181)" 

This reverts commit 2da2a44382, reversing
changes made to 58855475c6.
This commit is contained in:
Fabien Potencier 2012-09-05 17:44:14 +02:00
parent aae4ceea56
commit 00ec9b5391
2 changed files with 27 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ use Symfony\Component\HttpKernel\Log\LoggerInterface;
* UrlGenerator generates a URL based on a set of routes. * UrlGenerator generates a URL based on a set of routes.
* *
* @author Fabien Potencier <fabien@symfony.com> * @author Fabien Potencier <fabien@symfony.com>
* @author Tobias Schultze <http://tobion.de>
* *
* @api * @api
*/ */
@ -133,10 +132,13 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute) protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute)
{ {
$variables = array_flip($variables); $variables = array_flip($variables);
$mergedParams = array_replace($this->context->getParameters(), $defaults, $parameters);
$originParameters = $parameters;
$parameters = array_replace($this->context->getParameters(), $parameters);
$tparams = array_replace($defaults, $parameters);
// all params must be given // all params must be given
if ($diff = array_diff_key($variables, $mergedParams)) { if ($diff = array_diff_key($variables, $tparams)) {
throw new MissingMandatoryParametersException(sprintf('The "%s" route has some missing mandatory parameters ("%s").', $name, implode('", "', array_keys($diff)))); throw new MissingMandatoryParametersException(sprintf('The "%s" route has some missing mandatory parameters ("%s").', $name, implode('", "', array_keys($diff))));
} }
@ -144,26 +146,30 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
$optional = true; $optional = true;
foreach ($tokens as $token) { foreach ($tokens as $token) {
if ('variable' === $token[0]) { if ('variable' === $token[0]) {
if (!$optional || !array_key_exists($token[3], $defaults) || (string) $mergedParams[$token[3]] !== (string) $defaults[$token[3]]) { if (false === $optional || !array_key_exists($token[3], $defaults) || (isset($parameters[$token[3]]) && (string) $parameters[$token[3]] != (string) $defaults[$token[3]])) {
// check requirement if (!$isEmpty = in_array($tparams[$token[3]], array(null, '', false), true)) {
if (!preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) { // check requirement
$message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $mergedParams[$token[3]]); if ($tparams[$token[3]] && !preg_match('#^'.$token[2].'$#', $tparams[$token[3]])) {
if ($this->strictRequirements) { $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $tparams[$token[3]]);
throw new InvalidParameterException($message); if ($this->strictRequirements) {
} throw new InvalidParameterException($message);
}
if ($this->logger) { if ($this->logger) {
$this->logger->err($message); $this->logger->err($message);
} }
return null; return null;
}
}
if (!$isEmpty || !$optional) {
$url = $token[1].$tparams[$token[3]].$url;
} }
$url = $token[1].$mergedParams[$token[3]].$url;
$optional = false; $optional = false;
} }
} else { } elseif ('text' === $token[0]) {
// static text
$url = $token[1].$url; $url = $token[1].$url;
$optional = false; $optional = false;
} }
@ -187,7 +193,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
} }
// add a query string if needed // add a query string if needed
$extra = array_diff_key($parameters, $variables); $extra = array_diff_key($originParameters, $variables, $defaults);
if ($extra && $query = http_build_query($extra, '', '&')) { if ($extra && $query = http_build_query($extra, '', '&')) {
$url .= '?'.$query; $url .= '?'.$query;
} }

43
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
View File

@ -74,15 +74,12 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('/app.php/testing', $url); $this->assertEquals('/app.php/testing', $url);
} }
/**
* @expectedException Symfony\Component\Routing\Exception\InvalidParameterException
*/
public function testRelativeUrlWithNullParameterButNotOptional() public function testRelativeUrlWithNullParameterButNotOptional()
{ {
$routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', array('foo' => null))); $routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', array('foo' => null)));
// This must raise an exception because the default requirement for "foo" is "[^/]+" which is not met with these params. $url = $this->getGenerator($routes)->generate('test', array(), false);
// Generating path "/testing//bar" would be wrong as matching this route would fail.
$this->getGenerator($routes)->generate('test', array(), false); $this->assertEquals('/app.php/testing//bar', $url);
} }
public function testRelativeUrlWithOptionalZeroParameter() public function testRelativeUrlWithOptionalZeroParameter()
@ -93,13 +90,6 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('/app.php/testing/0', $url); $this->assertEquals('/app.php/testing/0', $url);
} }
public function testNotPassedOptionalParameterInBetween()
{
$routes = $this->getRoutes('test', new Route('/{slug}/{page}', array('slug' => 'index', 'page' => 0)));
$this->assertSame('/app.php/index/1', $this->getGenerator($routes)->generate('test', array('page' => 1)));
$this->assertSame('/app.php/', $this->getGenerator($routes)->generate('test'));
}
public function testRelativeUrlWithExtraParameters() public function testRelativeUrlWithExtraParameters()
{ {
$routes = $this->getRoutes('test', new Route('/testing')); $routes = $this->getRoutes('test', new Route('/testing'));
@ -175,15 +165,6 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
$this->getGenerator($routes)->generate('test', array('foo' => 'bar'), true); $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), true);
} }
/**
* @expectedException Symfony\Component\Routing\Exception\InvalidParameterException
*/
public function testGenerateForRouteWithInvalidParameter()
{
$routes = $this->getRoutes('test', new Route('/testing/{foo}', array(), array('foo' => '1|2')));
$this->getGenerator($routes)->generate('test', array('foo' => '0'), true);
}
public function testGenerateForRouteWithInvalidOptionalParameterNonStrict() public function testGenerateForRouteWithInvalidOptionalParameterNonStrict()
{ {
$routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+'))); $routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+')));
@ -216,15 +197,6 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
$this->getGenerator($routes)->generate('test', array('foo' => 'bar'), true); $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), true);
} }
/**
* @expectedException Symfony\Component\Routing\Exception\InvalidParameterException
*/
public function testRequiredParamAndEmptyPassed()
{
$routes = $this->getRoutes('test', new Route('/{slug}', array(), array('slug' => '.+')));
$this->getGenerator($routes)->generate('test', array('slug' => ''));
}
public function testSchemeRequirementDoesNothingIfSameCurrentScheme() public function testSchemeRequirementDoesNothingIfSameCurrentScheme()
{ {
$routes = $this->getRoutes('test', new Route('/', array(), array('_scheme' => 'http'))); $routes = $this->getRoutes('test', new Route('/', array(), array('_scheme' => 'http')));
@ -257,15 +229,6 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo'))); $this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo')));
} }
public function testQueryParamSameAsDefault()
{
$routes = $this->getRoutes('test', new Route('/test', array('default' => 'value')));
$this->assertSame('/app.php/test?default=foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo')));
$this->assertSame('/app.php/test?default=value', $this->getGenerator($routes)->generate('test', array('default' => 'value')));
$this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test'));
}
public function testUrlEncoding() public function testUrlEncoding()
{ {
// This tests the encoding of reserved characters that are used for delimiting of URI components (defined in RFC 3986) // This tests the encoding of reserved characters that are used for delimiting of URI components (defined in RFC 3986)