[FrameworkBundle] forward the query params when redirecting

Amrouche Hamza · Amrouche Hamza · commit c8c18f270f75 · 2018-02-23T10:18:35.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -46,11 +46,7 @@ public function __construct(UrlGeneratorInterface $router = null, int $httpPort
      * In case the route name is empty, the status code will be 404 when permanent is false
      * and 410 otherwise.
      *
-     * @param Request    $request           The request instance
-     * @param string     $route             The route name to redirect to
-     * @param bool       $permanent         Whether the redirection is permanent
      * @param bool|array $ignoreAttributes  Whether to ignore attributes or an array of attributes to ignore
-     * @param bool       $keepRequestMethod Wheter redirect action should keep HTTP request method
      *
      * @throws HttpException In case the route name is empty
      */
@@ -61,11 +57,11 @@ public function redirectAction(Request $request, string $route, bool $permanent
         }
 
         $attributes = array();
-        if (false === $ignoreAttributes || is_array($ignoreAttributes)) {
+        if (false === $ignoreAttributes || \is_array($ignoreAttributes)) {
             $attributes = \array_merge($request->query->all(), $request->attributes->get('_route_params'));
             unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes'], $attributes['keepRequestMethod']);
             if ($ignoreAttributes) {
-                $attributes = array_diff_key($attributes, array_flip($ignoreAttributes));
+                $attributes = \array_diff_key($attributes, \array_flip($ignoreAttributes));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,7 @@ public function __construct(UrlGeneratorInterface $router = null, int $httpPort`
`46`	`46`	`* In case the route name is empty, the status code will be 404 when permanent is false`
`47`	`47`	`* and 410 otherwise.`
`48`	`48`	`*`
`49`		`- * @param Request $request The request instance`
`50`		`- * @param string $route The route name to redirect to`
`51`		`- * @param bool $permanent Whether the redirection is permanent`
`52`	`49`	`* @param bool\|array $ignoreAttributes Whether to ignore attributes or an array of attributes to ignore`
`53`		`- * @param bool $keepRequestMethod Wheter redirect action should keep HTTP request method`
`54`	`50`	`*`
`55`	`51`	`* @throws HttpException In case the route name is empty`
`56`	`52`	`*/`
`@@ -61,11 +57,11 @@ public function redirectAction(Request $request, string $route, bool $permanent`
`61`	`57`	`}`
`62`	`58`
`63`	`59`	`$attributes = array();`
`64`		`- if (false === $ignoreAttributes \|\| is_array($ignoreAttributes)) {`
	`60`	`+ if (false === $ignoreAttributes \|\| \is_array($ignoreAttributes)) {`
`65`	`61`	`$attributes = \array_merge($request->query->all(), $request->attributes->get('_route_params'));`
`66`	`62`	`unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes'], $attributes['keepRequestMethod']);`
`67`	`63`	`if ($ignoreAttributes) {`
`68`		`- $attributes = array_diff_key($attributes, array_flip($ignoreAttributes));`
	`64`	`+ $attributes = \array_diff_key($attributes, \array_flip($ignoreAttributes));`
`69`	`65`	`}`
`70`	`66`	`}`
`71`	`67`