Merge branch '6.4' into 7.0

* 6.4:
  Fix implicitly-required parameters
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
  [Messenger][AmazonSqs] Allow async-aws/sqs version 2

Author: nicolas-grekas

AppVariable.php

@@ -165,7 +165,7 @@ public function getEnabled_locales(): array
      *  * getFlashes('notice') returns a simple array with flash messages of that type
      *  * getFlashes(['notice', 'error']) returns a nested array of type => messages.
      */
-    public function getFlashes(string|array $types = null): array
+    public function getFlashes(string|array|null $types = null): array
     {
         try {
             $session = $this->getSession();

Command/DebugCommand.php

@@ -48,7 +48,7 @@ class DebugCommand extends Command
 
     private ?FileLinkFormatter $fileLinkFormatter;
 
-    public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = [], string $twigDefaultPath = null, FileLinkFormatter $fileLinkFormatter = null)
+    public function __construct(Environment $twig, ?string $projectDir = null, array $bundlesMetadata = [], ?string $twigDefaultPath = null, ?FileLinkFormatter $fileLinkFormatter = null)
     {
         parent::__construct();
 
@@ -214,7 +214,7 @@ private function displayPathsJson(SymfonyStyle $io, string $name): void
         $io->writeln(json_encode($data));
     }
 
-    private function displayGeneralText(SymfonyStyle $io, string $filter = null): void
+    private function displayGeneralText(SymfonyStyle $io, ?string $filter = null): void
     {
         $decorated = $io->isDecorated();
         $types = ['functions', 'filters', 'tests', 'globals'];
@@ -276,7 +276,7 @@ private function displayGeneralJson(SymfonyStyle $io, ?string $filter): void
         $io->writeln($decorated ? OutputFormatter::escape($data) : $data);
     }
 
-    private function getLoaderPaths(string $name = null): array
+    private function getLoaderPaths(?string $name = null): array
     {
         $loaderPaths = [];
         foreach ($this->getFilesystemLoaders() as $loader) {

Command/LintCommand.php

@@ -221,7 +221,7 @@ private function displayJson(OutputInterface $output, array $filesInfo): int
         return min($errors, 1);
     }
 
-    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null): void
+    private function renderException(SymfonyStyle $output, string $template, Error $exception, ?string $file = null, ?GithubActionReporter $githubReporter = null): void
     {
         $line = $exception->getTemplateLine();
 

DataCollector/TwigDataCollector.php

@@ -32,13 +32,13 @@ class TwigDataCollector extends DataCollector implements LateDataCollectorInterf
     private ?Environment $twig;
     private array $computed;
 
-    public function __construct(Profile $profile, Environment $twig = null)
+    public function __construct(Profile $profile, ?Environment $twig = null)
     {
         $this->profile = $profile;
         $this->twig = $twig;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
     }
 

ErrorRenderer/TwigErrorRenderer.php

@@ -32,7 +32,7 @@ class TwigErrorRenderer implements ErrorRendererInterface
     /**
      * @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
      */
-    public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorRenderer = null, bool|callable $debug = false)
+    public function __construct(Environment $twig, ?HtmlErrorRenderer $fallbackErrorRenderer = null, bool|callable $debug = false)
     {
         $this->twig = $twig;
         $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();

Extension/AssetExtension.php

@@ -43,15 +43,15 @@ public function getFunctions(): array
      * If the package used to generate the path is an instance of
      * UrlPackage, you will always get a URL and not a path.
      */
-    public function getAssetUrl(string $path, string $packageName = null): string
+    public function getAssetUrl(string $path, ?string $packageName = null): string
     {
         return $this->packages->getUrl($path, $packageName);
     }
 
     /**
      * Returns the version of an asset.
      */
-    public function getAssetVersion(string $path, string $packageName = null): string
+    public function getAssetVersion(string $path, ?string $packageName = null): string
     {
         return $this->packages->getVersion($path, $packageName);
     }

Extension/DumpExtension.php

@@ -29,7 +29,7 @@ final class DumpExtension extends AbstractExtension
     private ClonerInterface $cloner;
     private ?HtmlDumper $dumper;
 
-    public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)
+    public function __construct(ClonerInterface $cloner, ?HtmlDumper $dumper = null)
     {
         $this->cloner = $cloner;
         $this->dumper = $dumper;

Extension/FormExtension.php

@@ -35,7 +35,7 @@ final class FormExtension extends AbstractExtension
 {
     private ?TranslatorInterface $translator;
 
-    public function __construct(TranslatorInterface $translator = null)
+    public function __construct(?TranslatorInterface $translator = null)
     {
         $this->translator = $translator;
     }

Extension/HtmlSanitizerExtension.php

@@ -33,7 +33,7 @@ public function getFilters(): array
         ];
     }
 
-    public function sanitize(string $html, string $sanitizer = null): string
+    public function sanitize(string $html, ?string $sanitizer = null): string
     {
         return $this->sanitizers->get($sanitizer ?? $this->defaultSanitizer)->sanitize($html);
     }

Extension/HttpKernelRuntime.php

@@ -25,7 +25,7 @@ final class HttpKernelRuntime
     private FragmentHandler $handler;
     private ?FragmentUriGeneratorInterface $fragmentUriGenerator;
 
-    public function __construct(FragmentHandler $handler, FragmentUriGeneratorInterface $fragmentUriGenerator = null)
+    public function __construct(FragmentHandler $handler, ?FragmentUriGeneratorInterface $fragmentUriGenerator = null)
     {
         $this->handler = $handler;
         $this->fragmentUriGenerator = $fragmentUriGenerator;