Merge branch '5.4' into 6.0

* 5.4:
  [HttpClient] fix
  [HttpClient] Handle requests with null body
  [WebProfilerBundle] Log section minor fixes (missing "notice" filter, log priority, accessibility)
  Fix link not present

Author: nicolas-grekas

AmpHttpClient.php

@@ -43,6 +43,8 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface,
     use LoggerAwareTrait;
 
     private array $defaultOptions = self::OPTIONS_DEFAULTS;
+    private static array $emptyDefaults = self::OPTIONS_DEFAULTS;
+
     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 array $emptyDefaults = self::OPTIONS_DEFAULTS + ['auth_ntlm' => null];
 
     private ?LoggerInterface $logger = null;
 

HttpClientTrait.php

@@ -201,6 +201,12 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         $options += $defaultOptions;
 
+        foreach (self::$emptyDefaults ?? [] as $k => $v) {
+            if (!isset($options[$k])) {
+                $options[$k] = $v;
+            }
+        }
+
         if (isset($defaultOptions['extra'])) {
             $options['extra'] += $defaultOptions['extra'];
         }
@@ -233,9 +239,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;
                 }
             }
 

NativeHttpClient.php

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

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();
+    }
 }