diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index 244e8a0f355a..05e39a27a0a6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -128,8 +128,7 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
$scheme = $request->getScheme();
}
- $qs = $request->getQueryString();
- if ($qs) {
+ if ($qs = $request->server->get('QUERY_STRING') ?: $request->getQueryString()) {
if (false === strpos($path, '?')) {
$qs = '?'.$qs;
} else {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
index 4bd0212e6953..78d41a2f2bc7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -220,9 +220,9 @@ public function pathQueryParamsProvider()
return [
['http://www.example.com/base/redirect-path', '/redirect-path', ''],
['http://www.example.com/base/redirect-path?foo=bar', '/redirect-path?foo=bar', ''],
- ['http://www.example.com/base/redirect-path?foo=bar', '/redirect-path', 'foo=bar'],
- ['http://www.example.com/base/redirect-path?foo=bar&abc=example', '/redirect-path?foo=bar', 'abc=example'],
- ['http://www.example.com/base/redirect-path?foo=bar&abc=example&baz=def', '/redirect-path?foo=bar', 'abc=example&baz=def'],
+ ['http://www.example.com/base/redirect-path?f.o=bar', '/redirect-path', 'f.o=bar'],
+ ['http://www.example.com/base/redirect-path?f.o=bar&a.c=example', '/redirect-path?f.o=bar', 'a.c=example'],
+ ['http://www.example.com/base/redirect-path?f.o=bar&a.c=example&b.z=def', '/redirect-path?f.o=bar', 'a.c=example&b.z=def'],
];
}
@@ -246,29 +246,20 @@ public function testPathQueryParams($expectedUrl, $path, $queryString)
private function createRequestObject($scheme, $host, $port, $baseUrl, $queryString = '')
{
- $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
- $request
- ->expects($this->any())
- ->method('getScheme')
- ->willReturn($scheme);
- $request
- ->expects($this->any())
- ->method('getHost')
- ->willReturn($host);
- $request
- ->expects($this->any())
- ->method('getPort')
- ->willReturn($port);
- $request
- ->expects($this->any())
- ->method('getBaseUrl')
- ->willReturn($baseUrl);
- $request
- ->expects($this->any())
- ->method('getQueryString')
- ->willReturn($queryString);
-
- return $request;
+ if ('' !== $queryString) {
+ parse_str($queryString, $query);
+ } else {
+ $query = [];
+ }
+
+ return new Request($query, [], [], [], [], [
+ 'HTTPS' => 'https' === $scheme,
+ 'HTTP_HOST' => $host.($port ? ':'.$port : ''),
+ 'SERVER_PORT' => $port,
+ 'SCRIPT_FILENAME' => $baseUrl,
+ 'REQUEST_URI' => $baseUrl,
+ 'QUERY_STRING' => $queryString,
+ ]);
}
private function createRedirectController($httpPort = null, $httpsPort = null)
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy