Fix Uri query string not getting set.

When the `url` option is used, the query string if present should be set into the Uri instance. This makes it match up with the `query` property.
cakephp · Jan 5, 2017 · b07eb68 · b07eb68
1 parent 7716434
commit b07eb68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Http/ServerRequest.php b/src/Http/ServerRequest.php
@@ -314,6 +314,9 @@ protected function _setConfig($config)
         if ($config['url']) {
             $uri = $uri->withPath('/' . $config['url']);
         }
+        if (strlen($querystr)) {
+            $uri = $uri->withQuery($querystr);
+        }
 
         $this->uri = $uri;
         $this->base = $config['base'];

diff --git a/tests/TestCase/Network/RequestTest.php b/tests/TestCase/Network/RequestTest.php
@@ -172,6 +172,7 @@ public function testQueryStringParsingFromInputUrl()
         $expected = ['one' => 'something', 'two' => 'else'];
         $this->assertEquals($expected, $request->query);
         $this->assertEquals('some/path', $request->url);
+        $this->assertEquals('one=something&two=else', $request->getUri()->getQuery());
     }
 
     /**