Update getAbsoluteUri() for query string uris

georaldc · georaldc · commit 965408fd2d87 · 2016-07-08T11:46:34.000-07:00
Apply same rules to query string only URIs as what's being used for URIs containing only hash/anchor values
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -522,9 +522,9 @@ protected function getAbsoluteUri($uri)
             return parse_url($currentUri, PHP_URL_SCHEME).':'.$uri;
         }
 
-        // anchor?
-        if (!$uri || '#' == $uri[0]) {
-            return preg_replace('/#.*?$/', '', $currentUri).$uri;
+        // anchor or query string parameters?
+        if (!$uri || '#' == $uri[0] || '?' == $uri[0]) {
+            return preg_replace('/[#?].*?$/', '', $currentUri).$uri;
         }
 
         if ('/' !== $uri[0]) {
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -212,6 +212,15 @@ public function testRequestURIConversion()
         $client->request('GET', 'http://www.example.com/');
         $client->request('GET', 'http');
         $this->assertEquals('http://www.example.com/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+        $client = new TestClient();
+        $client->request('GET', 'http://www.example.com/foo');
+        $client->request('GET', '?');
+        $this->assertEquals('http://www.example.com/foo?', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
+        $client->request('GET', '?');
+        $this->assertEquals('http://www.example.com/foo?', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
+        $client->request('GET', '?foo=bar');
+        $this->assertEquals('http://www.example.com/foo?foo=bar', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
     }
 
     public function testRequestReferer()

Original file line number	Diff line number	Diff line change
`@@ -522,9 +522,9 @@ protected function getAbsoluteUri($uri)`
`522`	`522`	`return parse_url($currentUri, PHP_URL_SCHEME).':'.$uri;`
`523`	`523`	`}`
`524`	`524`
`525`		`- // anchor?`
`526`		`- if (!$uri \|\| '#' == $uri[0]) {`
`527`		`- return preg_replace('/#.*?$/', '', $currentUri).$uri;`
	`525`	`+ // anchor or query string parameters?`
	`526`	`+ if (!$uri \|\| '#' == $uri[0] \|\| '?' == $uri[0]) {`
	`527`	`+ return preg_replace('/[#?].*?$/', '', $currentUri).$uri;`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`if ('/' !== $uri[0]) {`