Merge branch '5.4' into 6.0

xabbuh · xabbuh · commit bd2510b7f103 · 2021-10-27T10:01:25.000+02:00
* 5.4: Fix some redundant @return phpdoc [Dotenv][Runtime] Add $overrideExistingVars to bootEnv() and loadEnv() and dotenv_overload to SymfonyRuntime Add check and tests for public properties [BrowserKit][HttpClient][Routing] support building query strings with stringables
diff --git a/Impersonate/ImpersonateUrlGenerator.php b/Impersonate/ImpersonateUrlGenerator.php
@@ -69,7 +69,7 @@ private function buildExitPath(string $targetUri = null): string
             $targetUri = $request->getRequestUri();
         }
 
-        $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE]);
+        $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE], '', '&');
 
         return $targetUri;
     }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private function buildExitPath(string $targetUri = null): string`
`69`	`69`	`$targetUri = $request->getRequestUri();`
`70`	`70`	`}`
`71`	`71`
`72`		`- $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE]);`
	`72`	`+ $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE], '', '&');`
`73`	`73`
`74`	`74`	`return $targetUri;`
`75`	`75`	`}`