Skip to content

[FrameworkBundle] [Routing] Check if default value matches requirement #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.7
Choose a base branch
from
Open

[FrameworkBundle] [Routing] Check if default value matches requirement #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function warmUp($cacheDir)
*/
private function resolveParameters(RouteCollection $collection)
{
foreach ($collection as $route) {
foreach ($collection as $routeName => $route) {
foreach ($route->getDefaults() as $name => $value) {
$route->setDefault($name, $this->resolve($value));
}
Expand All @@ -97,6 +97,18 @@ private function resolveParameters(RouteCollection $collection)
}

$route->setRequirement($name, $this->resolve($value));
$default = $route->getDefault($name);
$requirement = $route->getRequirement($name);

if (null !== $default && 1 !== preg_match('#'.$requirement.'#', $default)) {
throw new RuntimeException(sprintf(
'Default value "%s" for "%s" does not match requirement "%s" in "%s" route.',
$default,
$name,
$requirement,
$routeName
));
}
}

$route->setPath($this->resolve($route->getPath()));
Expand Down
18 changes: 17 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,29 @@ public function testExceptionOnNonStringParameter()
$router->getRouteCollection()->get('foo');
}

/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
* @expectedExceptionMessage Default value "baz" for "bar" does not match requirement "\d+" in "foo" route.
*/
public function testExceptionOnDefaultValueNotMatchingRequirement()
{
$routes = new RouteCollection();
$routes->add('foo', new Route('foo', array('bar' => 'baz'), array('bar' => '\d+')));

$sc = $this->getServiceContainer($routes);

$router = new Router($sc, 'foo');

$route = $router->getRouteCollection()->get('foo');
}

/**
* @dataProvider getNonStringValues
*/
public function testDefaultValuesAsNonStrings($value)
{
$routes = new RouteCollection();
$routes->add('foo', new Route('foo', array('foo' => $value), array('foo' => '\d+')));
$routes->add('foo', new Route('foo', array('foo' => $value)));

$sc = $this->getServiceContainer($routes);

Expand Down