[HttpClient] fix

nicolas-grekas · nicolas-grekas · commit 65609d88e92f · 2022-02-27T09:45:34.000+01:00
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -40,6 +40,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
         'auth_ntlm' => null, // array|string - an array containing the username as first value, and optionally the
                              //   password as the second one; or string like username:password - enabling NTLM auth
     ];
+    private static $emptyDefaults = self::OPTIONS_DEFAULTS + ['auth_ntlm' => null];
 
     /**
      * @var LoggerInterface|null
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -23,7 +23,6 @@
 trait HttpClientTrait
 {
     private static $CHUNK_SIZE = 16372;
-    private static $emptyDefaults;
 
     /**
      * Validates and normalizes method, URL and options, and merges them with defaults.
@@ -41,16 +40,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;
@@ -200,11 +189,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;
             }
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -36,6 +36,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac
     use LoggerAwareTrait;
 
     private $defaultOptions = self::OPTIONS_DEFAULTS;
+    private static $emptyDefaults = self::OPTIONS_DEFAULTS;
 
     /** @var NativeClientState */
     private $multi;
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -148,17 +148,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__);
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -202,4 +202,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();
+    }
 }
