Prevent (buggy) rewrite of URI query strings

Prepare tag 2.0.3

CHANGELOG.md

@@ -1,3 +1,8 @@
+v2.0.3
+------
+
+- Fix URI query string handling (do not rewrite)
+
 v2.0.2
 ------
 

lib/Uri.php

@@ -436,13 +436,13 @@ public function getAuthority($hiddenPass = true) {
 
     private function parseQueryParameters() {
         if ($this->query) {
-            parse_str(rawurldecode($this->query), $parameters);
+            $parameters = [];
+            foreach (explode("&", $this->query) as $pair) {
+                $pair = explode("=", $pair, 2);
+                $parameters[rawurldecode($pair[0])][] = rawurldecode(isset($pair[1]) ? $pair[1] : "");
+            }
 
             $this->queryParameters = $parameters;
-            $this->query = str_replace('+', '%20', http_build_query($parameters, '', '&'));
-
-            // Fix http_build_query adding equals sign to empty keys
-            $this->query = str_replace('=&', '&', rtrim($this->query, '='));
         }
     }
 

test/UriTest.php

@@ -200,7 +200,7 @@ public function provideUris() {
                     'host' => 'localhost',
                     'port' => '',
                     'path' => '/test.php',
-                    'query' => http_build_query(array('params'=>array(1,2))),
+                    'query' => "params[]=1&params[]=2",
                     'fragment' => ''
                 )
             )
@@ -223,14 +223,9 @@ public function testUri($rawUri, $expectedVals) {
     }
 
     public function testQueryParams() {
-        $uri = new Uri('http://localhost/test.php?params[]=1&params[]=2');
+        $uri = new Uri('http://localhost/test.php?params=1&params=2');
         $expected = array('params' => array(1, 2));
         $actual = $uri->getAllQueryParameters();
         $this->assertEquals($expected, $actual);
-
-        $uri = new Uri('http://localhost/test.php?params[1][0]=1&params[1][1]=2');
-        $expected = array('params' => array(1 => array(1, 2)));
-        $actual = $uri->getAllQueryParameters();
-        $this->assertEquals($expected, $actual);
     }
 }