Merge branch '5.4' into 6.2

* 5.4:
  minor #49431 [Mailer][Translation] Remove some `static` occurrences that may cause unstable tests (alexandre-daubois)
  [Workflow] remove new lines from workflow metadata
  Fix phpdocs in HttpClient, HttpFoundation, HttpKernel, Intl components
  [WebProfilerBundle] Render original (not encoded) email headers

Author: nicolas-grekas

AmpHttpClient.php

@@ -52,11 +52,11 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface,
     private AmpClientState $multi;
 
     /**
-     * @param array    $defaultOptions     Default requests' options
-     * @param callable $clientConfigurator A callable that builds a {@see DelegateHttpClient} from a {@see PooledHttpClient};
-     *                                     passing null builds an {@see InterceptedHttpClient} with 2 retries on failures
-     * @param int      $maxHostConnections The maximum number of connections to a single host
-     * @param int      $maxPendingPushes   The maximum number of pushed responses to accept in the queue
+     * @param array         $defaultOptions     Default requests' options
+     * @param callable|null $clientConfigurator A callable that builds a {@see DelegateHttpClient} from a {@see PooledHttpClient};
+     *                                          passing null builds an {@see InterceptedHttpClient} with 2 retries on failures
+     * @param int           $maxHostConnections The maximum number of connections to a single host
+     * @param int           $maxPendingPushes   The maximum number of pushed responses to accept in the queue
      *
      * @see HttpClientInterface::OPTIONS_DEFAULTS for available options
      */