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

Fragment/HIncludeFragmentRenderer.php

@@ -30,7 +30,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
     private string $charset;
 
     /**
-     * @param string $globalDefaultTemplate The global default content (it can be a template name or the content)
+     * @param string|null $globalDefaultTemplate The global default content (it can be a template name or the content)
      */
     public function __construct(Environment $twig = null, UriSigner $signer = null, string $globalDefaultTemplate = null, string $charset = 'utf-8')
     {

HttpCache/SurrogateInterface.php

@@ -51,8 +51,8 @@ public function needsParsing(Response $response): bool;
     /**
      * Renders a Surrogate tag.
      *
-     * @param string $alt     An alternate URI
-     * @param string $comment A comment to add as an esi:include tag
+     * @param string|null $alt     An alternate URI
+     * @param string      $comment A comment to add as an esi:include tag
      */
     public function renderIncludeTag(string $uri, string $alt = null, bool $ignoreErrors = true, string $comment = ''): string;