Merge branch '5.4' into 6.0

* 5.4:
  Revert "bug #45813 [HttpClient] Move Content-Type after Content-Length (nicolas-grekas)"
  [FrameworkBundle] Fix exit codes in debug:translation command
  [Cache] Declaratively declare/hide DoctrineProvider to avoid breaking static analysis
  [HttpClient] Let curl handle Content-Length headers
  Improve testsuite
  [HttpClient] Move Content-Type after Content-Length
  [HttpClient] minor cs fix
  [Config] Fix using null values with config builders

Author: nicolas-grekas

CurlHttpClient.php

@@ -200,7 +200,12 @@ public function request(string $method, string $url, array $options = []): Respo
             $options['headers'][] = 'Accept-Encoding: gzip'; // Expose only one encoding, some servers mess up when more are provided
         }
 
+        $hasContentLength = isset($options['normalized_headers']['content-length'][0]);
+
         foreach ($options['headers'] as $header) {
+            if ($hasContentLength && 0 === stripos($header, 'Content-Length:')) {
+                continue; // Let curl handle Content-Length headers
+            }
             if (':' === $header[-2] && \strlen($header) - 2 === strpos($header, ': ')) {
                 // curl requires a special syntax to send empty headers
                 $curlopts[\CURLOPT_HTTPHEADER][] = substr_replace($header, ';', -2);
@@ -227,7 +232,7 @@ public function request(string $method, string $url, array $options = []): Respo
                 };
             }
 
-            if (isset($options['normalized_headers']['content-length'][0])) {
+            if ($hasContentLength) {
                 $curlopts[\CURLOPT_INFILESIZE] = substr($options['normalized_headers']['content-length'][0], \strlen('Content-Length: '));
             } elseif (!isset($options['normalized_headers']['transfer-encoding'])) {
                 $curlopts[\CURLOPT_HTTPHEADER][] = 'Transfer-Encoding: chunked'; // Enable chunked request bodies

HttpClientTrait.php

@@ -88,12 +88,12 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             unset($options['json']);
 
             if (!isset($options['normalized_headers']['content-type'])) {
-                $options['normalized_headers']['content-type'] = [$options['headers'][] = 'Content-Type: application/json'];
+                $options['normalized_headers']['content-type'] = ['Content-Type: application/json'];
             }
         }
 
         if (!isset($options['normalized_headers']['accept'])) {
-            $options['normalized_headers']['accept'] = [$options['headers'][] = 'Accept: */*'];
+            $options['normalized_headers']['accept'] = ['Accept: */*'];
         }
 
         if (isset($options['body'])) {
@@ -104,7 +104,6 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
                 && ('' !== $h || ('' !== $options['body'] && !isset($options['normalized_headers']['transfer-encoding'])))
             ) {
                 $options['normalized_headers']['content-length'] = [substr_replace($h ?: 'Content-Length: ', \strlen($options['body']), 16)];
-                $options['headers'] = array_merge(...array_values($options['normalized_headers']));
             }
         }
 
@@ -146,11 +145,11 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         if (null !== $url) {
             // Merge auth with headers
             if (($options['auth_basic'] ?? false) && !($options['normalized_headers']['authorization'] ?? false)) {
-                $options['normalized_headers']['authorization'] = [$options['headers'][] = 'Authorization: Basic '.base64_encode($options['auth_basic'])];
+                $options['normalized_headers']['authorization'] = ['Authorization: Basic '.base64_encode($options['auth_basic'])];
             }
             // Merge bearer with headers
             if (($options['auth_bearer'] ?? false) && !($options['normalized_headers']['authorization'] ?? false)) {
-                $options['normalized_headers']['authorization'] = [$options['headers'][] = 'Authorization: Bearer '.$options['auth_bearer']];
+                $options['normalized_headers']['authorization'] = ['Authorization: Bearer '.$options['auth_bearer']];
             }
 
             unset($options['auth_basic'], $options['auth_bearer']);
@@ -172,6 +171,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         $options['max_duration'] = isset($options['max_duration']) ? (float) $options['max_duration'] : 0;
+        $options['headers'] = array_merge(...array_values($options['normalized_headers']));
 
         return [$url, $options];
     }

Tests/HttpClientTestCase.php

@@ -397,11 +397,22 @@ public function testNegativeTimeout()
         ])->getStatusCode());
     }
 
+    public function testRedirectAfterPost()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $response = $client->request('POST', 'http://localhost:8057/302/relative', [
+            'body' => 'abc',
+        ]);
+
+        $this->assertSame(200, $response->getStatusCode());
+    }
+
     public function testNullBody()
     {
-        $httpClient = $this->getHttpClient(__FUNCTION__);
+        $client = $this->getHttpClient(__FUNCTION__);
 
-        $httpClient->request('POST', 'http://localhost:8057/post', [
+        $client->request('POST', 'http://localhost:8057/post', [
             'body' => null,
         ]);