From 94979b91c6501c9222db989a3a7e4f8e3ced330e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 19 Feb 2018 15:59:04 +0100
Subject: [PATCH] Clean calls to http_build_query()

---
 Http/Firewall/SwitchUserListener.php | 2 +-
 Http/Logout/LogoutUrlGenerator.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Http/Firewall/SwitchUserListener.php b/Http/Firewall/SwitchUserListener.php
index f5113aa0c..05531d883 100644
--- a/Http/Firewall/SwitchUserListener.php
+++ b/Http/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/Http/Logout/LogoutUrlGenerator.php b/Http/Logout/LogoutUrlGenerator.php
index 1499d7e5e..28ff31550 100644
--- a/Http/Logout/LogoutUrlGenerator.php
+++ b/Http/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) {