Skip to content

Fixed router doesn't take additional default values #18111

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

Closed
wants to merge 12 commits into from
Closed

Fixed router doesn't take additional default values #18111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9c4a8e1
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
08c7517
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
14ec0da
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
24e37e2
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
6c9c008
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
20dfd2e
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
4143917
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
39f20a6
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
6a78781
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
6a464f9
#18035 Fix for Router doesn't take additional get parameter if defaul…
simonhayre Mar 11, 2016
b757023
Merge branch '18035-fix-for-router-doesnt-take-additional-default-val…
simonhayre Mar 11, 2016
96e81d4
18035 Changes from jakzal's review
simonhayre Mar 22, 2016
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
5 changes: 5 additions & 0 deletions src/Symfony/Component/Routing/Generator/UrlGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa

// add a query string if needed
$extra = array_diff_key($parameters, $variables, $defaults);
foreach($parameters as $key => $value) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing space after foreach

if (isset($defaults[$key]) && !array_key_exists($key, $variables) && $defaults[$key] !== $value) {
$extra[$key] = $value;
}
}
if ($extra && $query = http_build_query($extra, '', '&')) {
$url .= '?'.$query;
}
Expand Down
23 changes: 22 additions & 1 deletion src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,27 @@ public function testAbsoluteUrlWithExtraParameters()
$this->assertEquals('http://localhost/app.php/testing?foo=bar', $url);
}

public function testAbsoluteUrlWithExtraParametersAndDefault()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this test is not needed as its the same as the one you changed below

{
$routes = $this->getRoutes('test', new Route('/testing', array('foo' => 'bell')));
$url = $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL);
$this->assertEquals('http://localhost/app.php/testing?foo=bar', $url);
}

public function testAbsoluteUrlWithExtraParametersAndArrayDefault()
{
$routes = $this->getRoutes('test', new Route('/testing', array('foo' => array('bell'))));
$url = $this->getGenerator($routes)->generate('test', array('foo' => array('bar')), UrlGeneratorInterface::ABSOLUTE_URL);
$this->assertEquals('http://localhost/app.php/testing?foo%5B0%5D=bar', $url);
}

public function testAbsoluteUrlWithoutExtraParametersAndArrayDefault()
{
$routes = $this->getRoutes('test', new Route('/testing', array('foo' => array('bell'))));
$url = $this->getGenerator($routes)->generate('test', array('foo' => array('bell')), UrlGeneratorInterface::ABSOLUTE_URL);
$this->assertEquals('http://localhost/app.php/testing', $url);
}

public function testUrlWithNullExtraParameters()
{
$routes = $this->getRoutes('test', new Route('/testing'));
Expand Down Expand Up @@ -293,7 +314,7 @@ public function testQueryParamSameAsDefault()
{
$routes = $this->getRoutes('test', new Route('/test', array('default' => 'value')));

$this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', array('default' => 'foo')));
$this->assertSame('/app.php/test?default=foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo')));
$this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', array('default' => 'value')));
$this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test'));
}
Expand Down