Merge branch '6.0' into 6.1

* 6.0: (23 commits)
  Fix composer on appveyor
  fix bootstrap_3_layout ChoiceType's expanded label_html
  [Messenger][Security/Core] Remove legacy class aliases
  [PropertyAccess] Fix typo in PropertyAccessor::readProperty() DocBlock
  [PropertyInfo] PhpStanExtractor namespace missmatch issue
  [VarExporter] Fix exporting objects with readonly properties
  [ExpressionLanguage] Fix matches when the regexp is not valid
  [Messenger] Add mysql indexes back and work around deadlocks using soft-delete
  Add BC layer to handle old objects already present in cache
  [RateLimiter] Always store SlidingWindows with an expiration set
  [Validator] Fix File constraint invalid max size exception message
  [Console] Fix exit status on uncaught exception with negative code
  [Validator] fix #43345 @Assert\DivisibleBy
  [HttpClient] fix 303 after PUT and sending chunked requests
  [HttpClient] always send Content-Type when a body is passed
  [HttpClient] always send Content-Length when a body is passed
  [HttpClient] fix sending Content-Length/Type for POST
  Fix merge
  [HttpClient] fix sending PUT requests with curl
  Fix locales format in CrowdinProvider
  ...

Author: nicolas-grekas

AmpHttpClient.php

@@ -90,7 +90,7 @@ public function request(string $method, string $url, array $options = []): Respo
             }
         }
 
-        if ('' !== $options['body'] && 'POST' === $method && !isset($options['normalized_headers']['content-type'])) {
+        if (('' !== $options['body'] || 'POST' === $method || isset($options['normalized_headers']['content-length'])) && !isset($options['normalized_headers']['content-type'])) {
             $options['headers'][] = 'Content-Type: application/x-www-form-urlencoded';
         }
 

CurlHttpClient.php

@@ -240,8 +240,12 @@ public function request(string $method, string $url, array $options = []): Respo
 
             if ('POST' !== $method) {
                 $curlopts[\CURLOPT_UPLOAD] = true;
+
+                if (!isset($options['normalized_headers']['content-type'])) {
+                    $curlopts[\CURLOPT_HTTPHEADER][] = 'Content-Type: application/x-www-form-urlencoded';
+                }
             }
-        } elseif ('' !== $body || 'POST' === $method) {
+        } elseif ('' !== $body || 'POST' === $method || $hasContentLength) {
             $curlopts[\CURLOPT_POSTFIELDS] = $body;
         }
 

HttpClientTrait.php

@@ -105,8 +105,13 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
             if (\is_string($options['body'])
                 && (string) \strlen($options['body']) !== substr($h = $options['normalized_headers']['content-length'][0] ?? '', 16)
-                && ('' !== $h || ('' !== $options['body'] && !isset($options['normalized_headers']['transfer-encoding'])))
+                && ('' !== $h || '' !== $options['body'])
             ) {
+                if (isset($options['normalized_headers']['transfer-encoding'])) {
+                    unset($options['normalized_headers']['transfer-encoding']);
+                    $options['body'] = self::dechunk($options['body']);
+                }
+
                 $options['normalized_headers']['content-length'] = [substr_replace($h ?: 'Content-Length: ', \strlen($options['body']), 16)];
             }
         }
@@ -369,6 +374,22 @@ private static function normalizeBody($body)
         return $body;
     }
 
+    private static function dechunk(string $body): string
+    {
+        $h = fopen('php://temp', 'w+');
+        stream_filter_append($h, 'dechunk', \STREAM_FILTER_WRITE);
+        fwrite($h, $body);
+        $body = stream_get_contents($h, -1, 0);
+        rewind($h);
+        ftruncate($h, 0);
+
+        if (fwrite($h, '-') && '' !== stream_get_contents($h, -1, 0)) {
+            throw new TransportException('Request body has broken chunked encoding.');
+        }
+
+        return $body;
+    }
+
     /**
      * @throws InvalidArgumentException When an invalid fingerprint is passed
      */

NativeHttpClient.php

@@ -80,9 +80,20 @@ public function request(string $method, string $url, array $options = []): Respo
             }
         }
 
+        $hasContentLength = isset($options['normalized_headers']['content-length']);
+        $hasBody = '' !== $options['body'] || 'POST' === $method || $hasContentLength;
+
         $options['body'] = self::getBodyAsString($options['body']);
 
-        if ('' !== $options['body'] && 'POST' === $method && !isset($options['normalized_headers']['content-type'])) {
+        if (isset($options['normalized_headers']['transfer-encoding'])) {
+            unset($options['normalized_headers']['transfer-encoding']);
+            $options['headers'] = array_merge(...array_values($options['normalized_headers']));
+            $options['body'] = self::dechunk($options['body']);
+        }
+        if ('' === $options['body'] && $hasBody && !$hasContentLength) {
+            $options['headers'][] = 'Content-Length: 0';
+        }
+        if ($hasBody && !isset($options['normalized_headers']['content-type'])) {
             $options['headers'][] = 'Content-Type: application/x-www-form-urlencoded';
         }
 

Response/CurlResponse.php

@@ -406,6 +406,7 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
                 } elseif (303 === $info['http_code'] || ('POST' === $info['http_method'] && \in_array($info['http_code'], [301, 302], true))) {
                     $info['http_method'] = 'HEAD' === $info['http_method'] ? 'HEAD' : 'GET';
                     curl_setopt($ch, \CURLOPT_POSTFIELDS, '');
+                    curl_setopt($ch, \CURLOPT_CUSTOMREQUEST, $info['http_method']);
                 }
             }
 

Tests/HttpClientTestCase.php

@@ -403,10 +403,23 @@ public function testRedirectAfterPost()
         $client = $this->getHttpClient(__FUNCTION__);
 
         $response = $client->request('POST', 'http://localhost:8057/302/relative', [
-            'body' => 'abc',
+            'body' => '',
         ]);
 
         $this->assertSame(200, $response->getStatusCode());
+        $this->assertStringContainsStringIgnoringCase("\r\nContent-Length: 0", $response->getInfo('debug'));
+    }
+
+    public function testEmptyPut()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $response = $client->request('PUT', 'http://localhost:8057/post', [
+            'headers' => ['Content-Length' => '0'],
+        ]);
+
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertStringContainsString("\r\nContent-Length: ", $response->getInfo('debug'));
     }
 
     public function testNullBody()

Tests/MockHttpClientTest.php

@@ -217,12 +217,12 @@ public function testFixContentLength()
         $this->assertSame(['Content-Length: 7'], $requestOptions['normalized_headers']['content-length']);
 
         $response = $client->request('POST', 'http://localhost:8057/post', [
-            'body' => 'abc=def',
+            'body' => "8\r\nSymfony \r\n5\r\nis aw\r\n6\r\nesome!\r\n0\r\n\r\n",
             'headers' => ['Transfer-Encoding: chunked'],
         ]);
 
         $requestOptions = $response->getRequestOptions();
-        $this->assertFalse(isset($requestOptions['normalized_headers']['content-length']));
+        $this->assertSame(['Content-Length: 19'], $requestOptions['normalized_headers']['content-length']);
 
         $response = $client->request('POST', 'http://localhost:8057/post', [
             'body' => '',