Handle requests with null body

jderusse · jderusse · commit 6561f9ee84b3 · 2022-02-26T23:59:34.000+01:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -23,6 +23,7 @@
 trait HttpClientTrait
 {
     private static $CHUNK_SIZE = 16372;
+    private static $emptyDefaults;
 
     /**
      * Validates and normalizes method, URL and options, and merges them with defaults.
@@ -31,6 +32,15 @@ trait HttpClientTrait
      */
     private static function prepareRequest(?string $method, ?string $url, array $options, array $defaultOptions = [], bool $allowExtraOptions = false): array
     {
+        if (null === self::$emptyDefaults) {
+            self::$emptyDefaults = [];
+            foreach ($defaultOptions as $key => $v) {
+                if (isset($v)) {
+                    self::$emptyDefaults[$key] = $v;
+                }
+            }
+        }
+
         if (null !== $method) {
             if (\strlen($method) !== strspn($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')) {
                 throw new InvalidArgumentException(sprintf('Invalid HTTP method "%s", only uppercase letters are accepted.', $method));
@@ -188,6 +198,11 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
         $options['query'] = $options['query'] ?? [];
 
         $options += $defaultOptions;
+        foreach (self::$emptyDefaults as $key => $v) {
+            if (!isset($options[$key])) {
+                $options[$key] = $v;
+            }
+        }
 
         if (isset($defaultOptions['extra'])) {
             $options['extra'] += $defaultOptions['extra'];
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -148,6 +148,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__);
