Clean calls to http_build_query()

nicolas-grekas · nicolas-grekas · commit 15ab83769e9b · 2018-02-19T15:59:04.000+01:00
diff --git a/Firewall/SwitchUserListener.php b/Firewall/SwitchUserListener.php
@@ -89,7 +89,7 @@ public function handle(GetResponseEvent $event)
         }
 
         $request->query->remove($this->usernameParameter);
-        $request->server->set('QUERY_STRING', http_build_query($request->query->all()));
+        $request->server->set('QUERY_STRING', http_build_query($request->query->all(), '', '&'));
 
         $response = new RedirectResponse($request->getUri(), 302);
 
diff --git a/Logout/LogoutUrlGenerator.php b/Logout/LogoutUrlGenerator.php
@@ -128,7 +128,7 @@ private function generateLogoutUrl($key, $referenceType)
             $url = UrlGeneratorInterface::ABSOLUTE_URL === $referenceType ? $request->getUriForPath($logoutPath) : $request->getBaseUrl().$logoutPath;
 
             if (!empty($parameters)) {
-                $url .= '?'.http_build_query($parameters);
+                $url .= '?'.http_build_query($parameters, '', '&');
             }
         } else {
             if (!$this->router) {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function handle(GetResponseEvent $event)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`$request->query->remove($this->usernameParameter);`
`92`		`- $request->server->set('QUERY_STRING', http_build_query($request->query->all()));`
	`92`	`+ $request->server->set('QUERY_STRING', http_build_query($request->query->all(), '', '&'));`
`93`	`93`
`94`	`94`	`$response = new RedirectResponse($request->getUri(), 302);`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private function generateLogoutUrl($key, $referenceType)`
`128`	`128`	`$url = UrlGeneratorInterface::ABSOLUTE_URL === $referenceType ? $request->getUriForPath($logoutPath) : $request->getBaseUrl().$logoutPath;`
`129`	`129`
`130`	`130`	`if (!empty($parameters)) {`
`131`		`- $url .= '?'.http_build_query($parameters);`
	`131`	`+ $url .= '?'.http_build_query($parameters, '', '&');`
`132`	`132`	`}`
`133`	`133`	`} else {`
`134`	`134`	`if (!$this->router) {`