Fixes errors

Author: sagikazarmark

src/HttpAdapterTest.php

@@ -132,8 +132,12 @@ public function testSendRequest($method, $uri, array $headers, $body)
      */
     public function testSendRequestWithOutcome($uriAndOutcome, $protocolVersion, array $headers, $body)
     {
+        if ($protocolVersion === '1.0') {
+            $body = null;
+        }
+
         $request = self::$messageFactory->createRequest(
-            'GET',
+            $method = 'GET',
             $uriAndOutcome[0],
             $protocolVersion,
             $headers,
@@ -142,9 +146,12 @@ public function testSendRequestWithOutcome($uriAndOutcome, $protocolVersion, arr
 
         $response = $this->httpAdapter->sendRequest($request);
 
+        $outcome = $uriAndOutcome[1];
+        $outcome['protocolVersion'] = $protocolVersion;
+
         $this->assertResponse(
             $response,
-            $uriAndOutcome[1]
+            $outcome
         );
         $this->assertRequest($method, $headers, $body, $protocolVersion);
     }
@@ -214,9 +221,10 @@ public function requestProvider()
     public function requestWithOutcomeProvider()
     {
         $sets = [
-            'uriAndOutcome' => $this->getUrisAndOutcomes(),
-            'headers'       => $this->getHeaders(),
-            'body'          => $this->getBodies(),
+            'urisAndOutcomes'  => $this->getUrisAndOutcomes(),
+            'protocolVersions' => $this->getProtocolVersions(),
+            'headers'          => $this->getHeaders(),
+            'body'             => $this->getBodies(),
         ];
 
         $cartesianProduct = new CartesianProduct($sets);
@@ -274,7 +282,7 @@ public function erroredRequestsProvider()
         }
 
         // First x are simple requests, all-x are errored requests
-        return [[array_chunk($requests, count($requests)/2)]];
+        return [array_chunk($requests, count($requests)/2)];
     }
 
     /**
@@ -357,12 +365,13 @@ private function getProtocolVersions()
      */
     private function getHeaders()
     {
+        $headers = $this->defaultHeaders;
+        $headers['Accept-Charset'] = 'utf-8';
+        $headers['Accept-Language'] = 'en';
+
         return [
             $this->defaultHeaders,
-            array_merge($this->defaultHeaders, [
-                'Accept-Charset' => 'utf-8',
-                'Accept-Language:fr',
-            ]),
+            $headers,
         ];
     }