Fixing nested query strings

guzzle · May 27, 2015 · 6f3db16 · boast · May 28, 2015 · 6f3db16
1 parent ffa8119
commit 6f3db16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Client.php b/src/Client.php
@@ -341,7 +341,7 @@ private function applyOptions(RequestInterface $request, array &$options)
         if (isset($options['query'])) {
             $value = $options['query'];
             if (is_array($value)) {
-                $value = http_build_query($value, null, null, PHP_QUERY_RFC3986);
+                $value = http_build_query($value, null, '&', PHP_QUERY_RFC3986);
             }
             if (!is_string($value)) {
                 throw new Iae('query must be a string or array');

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -484,4 +484,13 @@ public function testCanSetCustomHandler()
             ])->getStatusCode()
         );
     }
+
+    public function testProperlyBuildsQuery()
+    {
+        $mock = new MockHandler([new Response(200)]);
+        $client = new Client(['handler' => $mock]);
+        $request = new Request('PUT', 'http://foo.com');
+        $client->send($request, ['query' => ['foo' => 'bar', 'john' => 'doe']]);
+        $this->assertEquals('foo=bar&john=doe', $mock->getLastRequest()->getUri()->getQuery());
+    }
 }