Merge branch '4.4' into 5.4

* 4.4:
  [HttpClient] fix

Author: nicolas-grekas

AmpHttpClient.php

@@ -43,6 +43,7 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface,
     use LoggerAwareTrait;
 
     private $defaultOptions = self::OPTIONS_DEFAULTS;
+    private static $emptyDefaults = self::OPTIONS_DEFAULTS;
 
     /** @var AmpClientState */
     private $multi;

CurlHttpClient.php

@@ -43,6 +43,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
             'curl' => [],    // A list of extra curl options indexed by their corresponding CURLOPT_*
         ],
     ];
+    private static $emptyDefaults = self::OPTIONS_DEFAULTS + ['auth_ntlm' => null];
 
     /**
      * @var LoggerInterface|null

HttpClientTrait.php

@@ -24,7 +24,6 @@
 trait HttpClientTrait
 {
     private static $CHUNK_SIZE = 16372;
-    private static $emptyDefaults;
 
     /**
      * {@inheritdoc}
@@ -53,16 +52,6 @@ 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;
@@ -212,11 +201,7 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         $options += $defaultOptions;
 
-        if (null === self::$emptyDefaults) {
-            self::$emptyDefaults = [];
-        }
-
-        foreach (self::$emptyDefaults as $k => $v) {
+        foreach (self::$emptyDefaults ?? [] as $k => $v) {
             if (!isset($options[$k])) {
                 $options[$k] = $v;
             }

NativeHttpClient.php

@@ -37,6 +37,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac
     use LoggerAwareTrait;
 
     private $defaultOptions = self::OPTIONS_DEFAULTS;
+    private static $emptyDefaults = self::OPTIONS_DEFAULTS;
 
     /** @var NativeClientState */
     private $multi;

Tests/CurlHttpClientTest.php

@@ -71,17 +71,6 @@ 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__);

Tests/HttpClientTestCase.php

@@ -396,4 +396,15 @@ public function testNegativeTimeout()
             'timeout' => -1,
         ])->getStatusCode());
     }
+
+    public function testNullBody()
+    {
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+
+        $httpClient->request('POST', 'http://localhost:8057/post', [
+            'body' => null,
+        ]);
+
+        $this->expectNotToPerformAssertions();
+    }
 }