merged branch derrabus/ignore_attributes_in_redirect_controller (PR #8563)
This PR was merged into the 2.3 branch.
Discussion
----------
[FrameworkBundle] RedirectCotroller: The ignoreAttributes parameter should be ignored
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
As discussed in PR #7590, when pointing a route to FrameworkBundle's `RedirectController` the attribute `ignoreAttributes` is added to the new route's attributes, if specified as array. As @lsmith77 wrote in a comment to that PR, this should not be the intended behavior. A valid workaround is to add `ignoreAttributes` itself to this array.
The problem remained undiscovered by the unit test, as `ignoreAttribues` was not included in the `_route_params` of the faked `Request` object. This PR should fix both, the unit test and the `RedirectController` itself, so the workaround mentioned above is not necessary anymore. Additionally, my fix should not break any routing configuration that is using the workaround.
Commits
-------
dc1fff0
The ignoreAttributes itself should be ignored, too.
This commit is contained in:
commit
ef987f7b2e
@ -49,7 +49,7 @@ class RedirectController extends ContainerAware
|
|||||||
$attributes = array();
|
$attributes = array();
|
||||||
if (false === $ignoreAttributes || is_array($ignoreAttributes)) {
|
if (false === $ignoreAttributes || is_array($ignoreAttributes)) {
|
||||||
$attributes = $request->attributes->get('_route_params');
|
$attributes = $request->attributes->get('_route_params');
|
||||||
unset($attributes['route'], $attributes['permanent']);
|
unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes']);
|
||||||
if ($ignoreAttributes) {
|
if ($ignoreAttributes) {
|
||||||
$attributes = array_diff_key($attributes, array_flip($ignoreAttributes));
|
$attributes = array_diff_key($attributes, array_flip($ignoreAttributes));
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,7 @@ class RedirectControllerTest extends TestCase
|
|||||||
'route' => $route,
|
'route' => $route,
|
||||||
'permanent' => $permanent,
|
'permanent' => $permanent,
|
||||||
'additional-parameter' => 'value',
|
'additional-parameter' => 'value',
|
||||||
|
'ignoreAttributes' => $ignoreAttributes
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user