Merge branch '4.4' into 5.4

* 4.4:
  [HttpClient] Handle requests with null body

Author: nicolas-grekas

HttpClientTrait.php

@@ -24,6 +24,7 @@
 trait HttpClientTrait
 {
     private static $CHUNK_SIZE = 16372;
+    private static $emptyDefaults;
 
     /**
      * {@inheritdoc}
@@ -52,6 +53,16 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             }
         }
 
+        if (null === self::$emptyDefaults) {
+            self::$emptyDefaults = [];
+
+            foreach ($defaultOptions as $k => $v) {
+                if (null !== $v) {
+                    self::$emptyDefaults[$k] = $v;
+                }
+            }
+        }
+
         $options = self::mergeDefaultOptions($options, $defaultOptions, $allowExtraOptions);
 
         $buffer = $options['buffer'] ?? true;
@@ -201,6 +212,16 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         $options += $defaultOptions;
 
+        if (null === self::$emptyDefaults) {
+            self::$emptyDefaults = [];
+        }
+
+        foreach (self::$emptyDefaults as $k => $v) {
+            if (!isset($options[$k])) {
+                $options[$k] = $v;
+            }
+        }
+
         if (isset($defaultOptions['extra'])) {
             $options['extra'] += $defaultOptions['extra'];
         }
@@ -233,9 +254,9 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
             $alternatives = [];
 
-            foreach ($defaultOptions as $key => $v) {
-                if (levenshtein($name, $key) <= \strlen($name) / 3 || str_contains($key, $name)) {
-                    $alternatives[] = $key;
+            foreach ($defaultOptions as $k => $v) {
+                if (levenshtein($name, $k) <= \strlen($name) / 3 || str_contains($k, $name)) {
+                    $alternatives[] = $k;
                 }
             }
 

Tests/CurlHttpClientTest.php

@@ -71,6 +71,17 @@ public function testHandleIsReinitOnReset()
         self::assertNotSame($initialShareId, $clientState->share);
     }
 
+    public function testNullBody()
+    {
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+
+        $httpClient->request('POST', 'http://localhost:8057/post', [
+            'body' => null,
+        ]);
+
+        $this->expectNotToPerformAssertions();
+    }
+
     public function testProcessAfterReset()
     {
         $client = $this->getHttpClient(__FUNCTION__);