Merge pull request #614 from thephpleague/fix/url-encoding

Fix encoding of generated query strings
thephpleague · Feb 2, 2017 · b7a3fed · b7a3fed
2 parents a76238a + 0fae187
commit b7a3fed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Tool/QueryBuilderTrait.php b/src/Tool/QueryBuilderTrait.php
@@ -28,6 +28,6 @@ trait QueryBuilderTrait
      */
     protected function buildQueryString(array $params)
     {
-        return http_build_query($params, null, '&');
+        return http_build_query($params, null, '&', \PHP_QUERY_RFC3986);
     }
 }
diff --git a/test/src/Tool/QueryBuilderTraitTest.php b/test/src/Tool/QueryBuilderTraitTest.php
@@ -19,10 +19,11 @@ public function testBuildQueryString()
         $params = [
             'a' => 'foo',
             'b' => 'bar',
+            'c' => '+',
         ];
 
         $query = $this->buildQueryString($params);
 
-        $this->assertSame('a=foo&b=bar', $query);
+        $this->assertSame('a=foo&b=bar&c=%2B', $query);
     }
 }