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

CacheWarmer/AbstractPhpFileCacheWarmer.php

@@ -34,7 +34,7 @@ public function isOptional(): bool
         return true;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $arrayAdapter = new ArrayAdapter();
 
@@ -77,5 +77,5 @@ final protected function ignoreAutoloadException(string $class, \Exception $exce
     /**
      * @return bool false if there is nothing to warm-up
      */
-    abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string $buildDir = null): bool;
+    abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool;
 }

CacheWarmer/CachePoolClearerCacheWarmer.php

@@ -37,7 +37,7 @@ public function __construct(Psr6CacheClearer $poolClearer, array $pools = [])
         $this->pools = $pools;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         foreach ($this->pools as $pool) {
             if ($this->poolClearer->hasPool($pool)) {

CacheWarmer/ConfigBuilderCacheWarmer.php

@@ -31,13 +31,13 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
     private KernelInterface $kernel;
     private ?LoggerInterface $logger;
 
-    public function __construct(KernelInterface $kernel, LoggerInterface $logger = null)
+    public function __construct(KernelInterface $kernel, ?LoggerInterface $logger = null)
     {
         $this->kernel = $kernel;
         $this->logger = $logger;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         if (!$buildDir) {
             return [];

CacheWarmer/RouterCacheWarmer.php

@@ -34,7 +34,7 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $router = $this->container->get('router');
 

CacheWarmer/SerializerCacheWarmer.php

@@ -38,7 +38,7 @@ public function __construct(array $loaders, string $phpArrayFile)
         $this->loaders = $loaders;
     }
 
-    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string $buildDir = null): bool
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
     {
         if (!$this->loaders) {
             return true;

CacheWarmer/TranslationsCacheWarmer.php

@@ -33,7 +33,7 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $this->translator ??= $this->container->get('translator');
 

CacheWarmer/ValidatorCacheWarmer.php

@@ -38,7 +38,7 @@ public function __construct(ValidatorBuilder $validatorBuilder, string $phpArray
         $this->validatorBuilder = $validatorBuilder;
     }
 
-    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string $buildDir = null): bool
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
     {
         $loaders = $this->validatorBuilder->getLoaders();
         $metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), $arrayAdapter);

Command/CacheClearCommand.php

@@ -40,7 +40,7 @@ class CacheClearCommand extends Command
     private CacheClearerInterface $cacheClearer;
     private Filesystem $filesystem;
 
-    public function __construct(CacheClearerInterface $cacheClearer, Filesystem $filesystem = null)
+    public function __construct(CacheClearerInterface $cacheClearer, ?Filesystem $filesystem = null)
     {
         parent::__construct();
 

Command/CachePoolClearCommand.php

@@ -38,7 +38,7 @@ final class CachePoolClearCommand extends Command
     /**
      * @param string[]|null $poolNames
      */
-    public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null)
+    public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
     {
         parent::__construct();
 

Command/CachePoolDeleteCommand.php

@@ -35,7 +35,7 @@ final class CachePoolDeleteCommand extends Command
     /**
      * @param string[]|null $poolNames
      */
-    public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null)
+    public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
     {
         parent::__construct();