Merge branch '4.4'

Author: Tobion

CurlHttpClient.php

@@ -244,7 +244,7 @@ public function request(string $method, string $url, array $options = []): Respo
 
         // Prevent curl from sending its default Accept and Expect headers
         foreach (['accept', 'expect'] as $header) {
-            if (!isset($options['normalized_headers'][$header])) {
+            if (!isset($options['normalized_headers'][$header][0])) {
                 $curlopts[CURLOPT_HTTPHEADER][] = $header.':';
             }
         }
@@ -441,7 +441,7 @@ private static function createRedirectResolver(array $options, string $host): \C
                 return 0 !== stripos($h, 'Host:');
             });
 
-            if (isset($options['normalized_headers']['authorization']) || isset($options['normalized_headers']['cookie'])) {
+            if (isset($options['normalized_headers']['authorization'][0]) || isset($options['normalized_headers']['cookie'][0])) {
                 $redirectHeaders['no_auth'] = array_filter($options['headers'], static function ($h) {
                     return 0 !== stripos($h, 'Authorization:') && 0 !== stripos($h, 'Cookie:');
                 });

HttpClientTrait.php

@@ -55,7 +55,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         if (!isset($options['normalized_headers']['accept'])) {
-            $options['normalized_headers']['accept'] = [$options['headers'][] = 'Accept: *'];
+            $options['normalized_headers']['accept'] = [$options['headers'][] = 'Accept: */*'];
         }
 
         if (isset($options['body'])) {

Tests/HttpClientTestCase.php

@@ -21,6 +21,34 @@ public function testMaxDuration()
         $this->markTestSkipped('Implemented as of version 4.4');
     }
 
+    public function testAcceptHeader()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $response = $client->request('GET', 'http://localhost:8057');
+        $requestHeaders = $response->toArray();
+
+        $this->assertSame('*/*', $requestHeaders['HTTP_ACCEPT']);
+
+        $response = $client->request('GET', 'http://localhost:8057', [
+            'headers' => [
+                'Accept' => 'foo/bar',
+            ],
+        ]);
+        $requestHeaders = $response->toArray();
+
+        $this->assertSame('foo/bar', $requestHeaders['HTTP_ACCEPT']);
+
+        $response = $client->request('GET', 'http://localhost:8057', [
+            'headers' => [
+                'Accept' => null,
+            ],
+        ]);
+        $requestHeaders = $response->toArray();
+
+        $this->assertArrayNotHasKey('HTTP_ACCEPT', $requestHeaders);
+    }
+
     public function testToStream()
     {
         $client = $this->getHttpClient(__FUNCTION__);

Tests/HttpClientTraitTest.php

@@ -172,7 +172,7 @@ public function provideRemoveDotSegments()
     public function testAuthBearerOption()
     {
         [, $options] = self::prepareRequest('POST', 'http://example.com', ['auth_bearer' => 'foobar'], HttpClientInterface::OPTIONS_DEFAULTS);
-        $this->assertSame(['Accept: *', 'Authorization: Bearer foobar'], $options['headers']);
+        $this->assertSame(['Accept: */*', 'Authorization: Bearer foobar'], $options['headers']);
         $this->assertSame(['Authorization: Bearer foobar'], $options['normalized_headers']['authorization']);
     }
 

Tests/MockHttpClientTest.php

@@ -36,6 +36,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
     "SERVER_NAME": "127.0.0.1",
     "REQUEST_URI": "/",
     "REQUEST_METHOD": "GET",
+    "HTTP_ACCEPT": "*/*",
     "HTTP_FOO": "baR",
     "HTTP_HOST": "localhost:8057"
 }';
@@ -114,6 +115,12 @@ protected function getHttpClient(string $testCase): HttpClientInterface
                 $responses[] = $mock;
                 break;
 
+            case 'testAcceptHeader':
+                $responses[] = new MockResponse($body, ['response_headers' => $headers]);
+                $responses[] = new MockResponse(str_replace('*/*', 'foo/bar', $body), ['response_headers' => $headers]);
+                $responses[] = new MockResponse(str_replace('"HTTP_ACCEPT": "*/*",', '', $body), ['response_headers' => $headers]);
+                break;
+
             case 'testResolve':
                 $responses[] = new MockResponse($body, ['response_headers' => $headers]);
                 $responses[] = new MockResponse($body, ['response_headers' => $headers]);