See facebook/hhvm#1221

See facebook/hhvm#2018
See https://github.com/facebook/hhvm/blob/HHVM-3.3.1/hphp/doc/inconsistencies

Conflicts:
	tests/ZendTest/Http/ClientTest.php

test/ClientTest.php

@@ -374,4 +374,36 @@ public function testPrepareHeadersCreateRightHttpField()
         $this->assertArrayNotHasKey('content-length', $headers);
         $this->assertArrayHasKey('Content-Length', $headers);
     }
+
+    /**
+     * @group 6231
+     */
+    public function testHttpQueryParametersCastToString()
+    {
+        $client = new Client();
+
+        /* @var $adapter \PHPUnit_Framework_MockObject_MockObject|\Zend\Http\Client\Adapter\AdapterInterface */
+        $adapter = $this->getMock('Zend\Http\Client\Adapter\AdapterInterface');
+
+        $client->setAdapter($adapter);
+
+        $request = new Request();
+
+        $request->setUri('http://example.com/');
+        $request->getQuery()->set('foo', 'bar');
+
+        $response = new Response();
+
+        $adapter
+            ->expects($this->once())
+            ->method('write')
+            ->with(Request::METHOD_GET, 'http://example.com/?foo=bar');
+
+        $adapter
+            ->expects($this->any())
+            ->method('read')
+            ->will($this->returnValue($response->toString()));
+
+        $client->send($request);
+    }
 }