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

Controller/ExceptionPanelController.php

@@ -28,7 +28,7 @@ class ExceptionPanelController
     private HtmlErrorRenderer $errorRenderer;
     private ?Profiler $profiler;
 
-    public function __construct(HtmlErrorRenderer $errorRenderer, Profiler $profiler = null)
+    public function __construct(HtmlErrorRenderer $errorRenderer, ?Profiler $profiler = null)
     {
         $this->errorRenderer = $errorRenderer;
         $this->profiler = $profiler;

Controller/ProfilerController.php

@@ -41,7 +41,7 @@ class ProfilerController
     private ?ContentSecurityPolicyHandler $cspHandler;
     private ?string $baseDir;
 
-    public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ContentSecurityPolicyHandler $cspHandler = null, string $baseDir = null)
+    public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ?ContentSecurityPolicyHandler $cspHandler = null, ?string $baseDir = null)
     {
         $this->generator = $generator;
         $this->profiler = $profiler;
@@ -127,7 +127,7 @@ public function panelAction(Request $request, string $token): Response
      *
      * @throws NotFoundHttpException
      */
-    public function toolbarAction(Request $request, string $token = null): Response
+    public function toolbarAction(Request $request, ?string $token = null): Response
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');

Controller/RouterController.php

@@ -40,7 +40,7 @@ class RouterController
      */
     private iterable $expressionLanguageProviders;
 
-    public function __construct(?Profiler $profiler, Environment $twig, UrlMatcherInterface $matcher = null, RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
+    public function __construct(?Profiler $profiler, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
     {
         $this->profiler = $profiler;
         $this->twig = $twig;

EventListener/WebDebugToolbarListener.php

@@ -48,7 +48,7 @@ class WebDebugToolbarListener implements EventSubscriberInterface
     private ?ContentSecurityPolicyHandler $cspHandler;
     private ?DumpDataCollector $dumpDataCollector;
 
-    public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null, DumpDataCollector $dumpDataCollector = null)
+    public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, ?UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ?ContentSecurityPolicyHandler $cspHandler = null, ?DumpDataCollector $dumpDataCollector = null)
     {
         $this->twig = $twig;
         $this->urlGenerator = $urlGenerator;

Profiler/CodeExtension.php

@@ -157,7 +157,7 @@ public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?stri
     /**
      * Formats a file path.
      */
-    public function formatFile(string $file, int $line, string $text = null): string
+    public function formatFile(string $file, int $line, ?string $text = null): string
     {
         $file = trim($file);
 

Twig/WebProfilerExtension.php

@@ -37,7 +37,7 @@ class WebProfilerExtension extends ProfilerExtension
 
     private int $stackLevel = 0;
 
-    public function __construct(HtmlDumper $dumper = null)
+    public function __construct(?HtmlDumper $dumper = null)
     {
         $this->dumper = $dumper ?? new HtmlDumper();
         $this->dumper->setOutput($this->output = fopen('php://memory', 'r+'));
@@ -77,7 +77,7 @@ public function dumpData(Environment $env, Data $data, int $maxDepth = 0): strin
         return str_replace("\n</pre", '</pre', rtrim($dump));
     }
 
-    public function dumpLog(Environment $env, string $message, Data $context = null): string
+    public function dumpLog(Environment $env, string $message, ?Data $context = null): string
     {
         $message = self::escape($env, $message);
         $message = preg_replace('/&quot;(.*?)&quot;/', '&quot;<b>$1</b>&quot;', $message);