Merge pull request #45 from chrisryan/master

Update URL Encoding

Author: raybot

src/Util/Http.php

@@ -125,19 +125,19 @@ public static function buildQueryString(array $parameters)
     {
         $queryStrings = [];
         foreach ($parameters as $parameterName => $parameterValue) {
-            $parameterName = urlencode($parameterName);
+            $parameterName = rawurlencode($parameterName);
 
             if (is_array($parameterValue)) {
                 foreach ($parameterValue as $eachValue) {
-                    $eachValue = urlencode($eachValue);
+                    $eachValue = rawurlencode($eachValue);
                     $queryStrings[] = "{$parameterName}={$eachValue}";
                 }
             } elseif ($parameterValue === false) {
                 $queryStrings[] = "{$parameterName}=false";
             } elseif ($parameterValue === true) {
                 $queryStrings[] = "{$parameterName}=true";
             } else {
-                $parameterValue = urlencode($parameterValue);
+                $parameterValue = rawurlencode($parameterValue);
                 $queryStrings[] = "{$parameterName}={$parameterValue}";
             }
         }
@@ -178,8 +178,8 @@ public static function getQueryParams($url, array $collapsedParams = [])
                 list($name, $value) = $nameAndValue;
             }
 
-            $name = urldecode($name);
-            $value = urldecode($value);
+            $name = rawurldecode($name);
+            $value = rawurldecode($value);
             $collapsed = isset($collapsedParams[$name]);
 
             if (!array_key_exists($name, $result)) {
@@ -232,8 +232,8 @@ public static function getQueryParamsCollapsed($url, array $expectedArrayParams
                 list($name, $value) = $nameAndValue;
             }
 
-            $name = urldecode($name);
-            $value = urldecode($value);
+            $name = rawurldecode($name);
+            $value = rawurldecode($value);
 
             if (!array_key_exists($name, $result)) {
                 $result[$name] = $value;

tests/Util/HttpTest.php

@@ -103,7 +103,7 @@ public function buildQueryString_basicUse()
     {
         $data = ['foo' => 'bar', 'baz' => 'boom', 'cow' => 'milk', 'php' => 'hypertext processor', 'theFalse' => false, 'theTrue' => true];
 
-        $this->assertSame('foo=bar&baz=boom&cow=milk&php=hypertext+processor&theFalse=false&theTrue=true', H::buildQueryString($data));
+        $this->assertSame('foo=bar&baz=boom&cow=milk&php=hypertext%20processor&theFalse=false&theTrue=true', H::buildQueryString($data));
     }
 
     /**
@@ -114,7 +114,7 @@ public function buildQueryString_multiValue()
     {
         $data = ['param1' => ['value', 'another value'], 'param2' => 'a value'];
 
-        $this->assertSame('param1=value&param1=another+value&param2=a+value', H::buildQueryString($data));
+        $this->assertSame('param1=value&param1=another%20value&param2=a%20value', H::buildQueryString($data));
     }
 
     /**
@@ -123,7 +123,7 @@ public function buildQueryString_multiValue()
      */
     public function buildQueryString_complexValues()
     {
-        $this->assertSame('a+b+c=1%242%283&a+b+c=4%295%2A6', H::buildQueryString(['a b c' => ['1$2(3', '4)5*6']]));
+        $this->assertSame('a%20b%20c=1%242%283&a%20b%20c=4%295%2A6', H::buildQueryString(['a b c' => ['1$2(3', '4)5*6']]));
     }
 
     /**