Merge pull request #8 from niels-nijens/http-client-contracts

Add version 2 of the symfony/http-client-contracts dependency as possible requirement
superbrave · Dec 8, 2020 · 75a1d3c · 75a1d3c
2 parents a6fd56a + 190c19a
commit 75a1d3c
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 46 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.1.3",
         "symfony/cache": "^4.2",
-        "symfony/http-client-contracts": "^1.1"
+        "symfony/http-client-contracts": "^1.1 || ^2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.15",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/AuthZeroAuthenticatingHttpClientTest.php b/tests/AuthZeroAuthenticatingHttpClientTest.php
@@ -77,12 +77,13 @@ public function testRequestWithAuthZeroAuthenticationSuccessful()
         $response = $this->httpClient->request('GET', 'https://superbrave.nl/api');
 
         $this->assertSame(
-            array(
-                'authorization' => array(
-                    sprintf('Bearer %s', $accessToken),
-                ),
-            ),
-            $response->getRequestOptions()['headers']
+            [
+                'accept' => ['Accept: */*'],
+                'authorization' => [
+                    sprintf('Authorization: Bearer %s', $accessToken),
+                ],
+            ],
+            $response->getRequestOptions()['normalized_headers']
         );
     }
 
@@ -106,24 +107,26 @@ public function testRequestReadsAccessTokenFromCache()
         $response = $this->httpClient->request('GET', 'https://superbrave.nl/api');
 
         $this->assertSame(
-            array(
-                'authorization' => array(
-                    sprintf('Bearer %s', $accessToken),
-                ),
-            ),
-            $response->getRequestOptions()['headers']
+            [
+                'accept' => ['Accept: */*'],
+                'authorization' => [
+                    sprintf('Authorization: Bearer %s', $accessToken),
+                ],
+            ],
+            $response->getRequestOptions()['normalized_headers']
         );
         $this->assertSame('{"message": "Response from actual API."}', $response->getContent());
 
         $response = $this->httpClient->request('GET', 'https://superbrave.nl/api');
 
         $this->assertSame(
-            array(
-                'authorization' => array(
-                    sprintf('Bearer %s', $accessToken),
-                ),
-            ),
-            $response->getRequestOptions()['headers']
+            [
+                'accept' => ['Accept: */*'],
+                'authorization' => [
+                    sprintf('Authorization: Bearer %s', $accessToken),
+                ],
+            ],
+            $response->getRequestOptions()['normalized_headers']
         );
         $this->assertSame('{"message": "Another response from actual API."}', $response->getContent());
     }
@@ -168,8 +171,10 @@ public function testRequestWithAuthZeroAuthenticationUnsuccessful()
         $response = $this->httpClient->request('GET', 'https://superbrave.nl/api');
 
         $this->assertSame(
-            array(),
-            $response->getRequestOptions()['headers']
+            [
+                'accept' => ['Accept: */*'],
+            ],
+            $response->getRequestOptions()['normalized_headers']
         );
     }
 
@@ -191,8 +196,10 @@ public function testRequestWithAuthZeroAuthenticationUnexpectedResponse()
         $response = $this->httpClient->request('GET', 'https://superbrave.nl/api');
 
         $this->assertSame(
-            array(),
-            $response->getRequestOptions()['headers']
+            [
+                'accept' => ['Accept: */*'],
+            ],
+            $response->getRequestOptions()['normalized_headers']
         );
     }