Fix guzzle 6 (#10)

Author: joshlopes

src/Amara/OneHydra/Http/Transport/GuzzleTransport.php

@@ -44,17 +44,14 @@ public function execute(HttpRequestInterface $request)
         $guzzleRequest = new Request(
             $request->getMethod(),
             $request->getUrl(),
-            [
-                'query' => $request->getParams(),
-                'headers' => $request->getHeaders(),
-            ]
+            $request->getHeaders()
         );
 
         try {
-            $clientResponse = $this->guzzleClient->send($guzzleRequest);
+            $clientResponse = $this->guzzleClient->send($guzzleRequest, ['query' => $request->getParams()]);
         } catch (RequestException $e) {
             // Re-throw guzzle exception as our own
-            throw new HttpTransportException("Guzzle exception", 0, $e);
+            throw new HttpTransportException('Guzzle exception', 0, $e);
         }
 
         return (new HttpResponse())

tests/Amara/OneHydra/Http/Transport/GuzzleTransportTest.php

@@ -36,7 +36,7 @@ public function testExecuteWhenOkay()
         $method = 'GET';
         $url = '/foo';
         $params = ['oh' => 'hai'];
-        $headers = ['oh' => 'really'];
+        $headers = ['oh' => ['really']];
 
         $responseBody = '{}';
         $responseHeaders = ['went' => 'great'];
@@ -55,12 +55,12 @@ function (Request $request) use ($method, $url, $headers) {
                     $this->assertEquals($url, $request->getUri());
                     $this->assertEquals(
                         $headers,
-                        $request->getHeaders()['headers']
+                        $request->getHeaders()
                     );
 
                     return true;
                 }
-            )
+            ), ['query' => $params]
         )->willReturn($guzzleResponse);
 
         $guzzleTransport = new GuzzleTransport($guzzleClient->reveal());
@@ -85,7 +85,7 @@ public function testExecuteWhenGuzzleThrowsException()
 
         $request = $this->getRequestMock($url, $params, $headers, $method);
         $guzzleClient = $this->prophesize(Client::class);
-        $guzzleClient->send(Argument::type(Request::class))->willThrow(
+        $guzzleClient->send(Argument::type(Request::class), ['query' => $params])->willThrow(
             RequestException::class
         );