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

Ignore keepQueryParams attribute when generating route redirect.

Browse Source
This commit is contained in:
Valentin 2018-06-21 00:41:56 +03:00
parent 389fa4dc23
commit 1e10475d88
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
View File

@ -64,7 +64,7 @@ class RedirectController
if (false === $ignoreAttributes || is_array($ignoreAttributes)) { if (false === $ignoreAttributes || is_array($ignoreAttributes)) {
$attributes = $request->attributes->get('_route_params'); $attributes = $request->attributes->get('_route_params');
$attributes = $keepQueryParams ? array_merge($request->query->all(), $attributes) : $attributes; $attributes = $keepQueryParams ? array_merge($request->query->all(), $attributes) : $attributes;
unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes'], $attributes['keepRequestMethod']); unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes'], $attributes['keepRequestMethod'], $attributes['keepQueryParams']);
if ($ignoreAttributes) { if ($ignoreAttributes) {
$attributes = array_diff_key($attributes, array_flip($ignoreAttributes)); $attributes = array_diff_key($attributes, array_flip($ignoreAttributes));
} }

21
src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
View File

@ -47,7 +47,7 @@ class RedirectControllerTest extends TestCase
/** /**
* @dataProvider provider * @dataProvider provider
*/ */
public function testRoute($permanent, $keepRequestMethod, $ignoreAttributes, $expectedCode, $expectedAttributes) public function testRoute($permanent, $keepRequestMethod, $keepQueryParams, $ignoreAttributes, $expectedCode, $expectedAttributes)
{ {
$request = new Request(); $request = new Request();
@ -63,6 +63,7 @@ class RedirectControllerTest extends TestCase
'additional-parameter' => 'value', 'additional-parameter' => 'value',
'ignoreAttributes' => $ignoreAttributes, 'ignoreAttributes' => $ignoreAttributes,
'keepRequestMethod' => $keepRequestMethod, 'keepRequestMethod' => $keepRequestMethod,
'keepQueryParams' => $keepQueryParams,
), ),
); );
@ -77,7 +78,7 @@ class RedirectControllerTest extends TestCase
$controller = new RedirectController($router); $controller = new RedirectController($router);
$returnResponse = $controller->redirectAction($request, $route, $permanent, $ignoreAttributes, $keepRequestMethod); $returnResponse = $controller->redirectAction($request, $route, $permanent, $ignoreAttributes, $keepRequestMethod, $keepQueryParams);
$this->assertRedirectUrl($returnResponse, $url); $this->assertRedirectUrl($returnResponse, $url);
$this->assertEquals($expectedCode, $returnResponse->getStatusCode()); $this->assertEquals($expectedCode, $returnResponse->getStatusCode());
@ -86,14 +87,14 @@ class RedirectControllerTest extends TestCase
public function provider() public function provider()
{ {
return array( return array(
array(true, false, false, 301, array('additional-parameter' => 'value')), array(true, false, false, false, 301, array('additional-parameter' => 'value')),
array(false, false, false, 302, array('additional-parameter' => 'value')), array(false, false, false, false, 302, array('additional-parameter' => 'value')),
array(false, false, true, 302, array()), array(false, false, false, true, 302, array()),
array(false, false, array('additional-parameter'), 302, array()), array(false, false, false, array('additional-parameter'), 302, array()),
array(true, true, false, 308, array('additional-parameter' => 'value')), array(true, true, false, false, 308, array('additional-parameter' => 'value')),
array(false, true, false, 307, array('additional-parameter' => 'value')), array(false, true, false, false, 307, array('additional-parameter' => 'value')),
array(false, true, true, 307, array()), array(false, true, false, true, 307, array()),
array(false, true, array('additional-parameter'), 307, array()), array(false, true, true, array('additional-parameter'), 307, array()),
); );
} }