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

Command/DotenvDumpCommand.php

@@ -32,7 +32,7 @@ final class DotenvDumpCommand extends Command
     private string $projectDir;
     private ?string $defaultEnv;
 
-    public function __construct(string $projectDir, string $defaultEnv = null)
+    public function __construct(string $projectDir, ?string $defaultEnv = null)
     {
         $this->projectDir = $projectDir;
         $this->defaultEnv = $defaultEnv;

Dotenv.php

@@ -98,7 +98,7 @@ public function load(string $path, string ...$extraPaths): void
      * @throws FormatException when a file has a syntax error
      * @throws PathException   when a file does not exist or is not readable
      */
-    public function loadEnv(string $path, string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void
+    public function loadEnv(string $path, ?string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void
     {
         $k = $envKey ?? $this->envKey;
 

Exception/FormatException.php

@@ -20,7 +20,7 @@ final class FormatException extends \LogicException implements ExceptionInterfac
 {
     private FormatExceptionContext $context;
 
-    public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message, FormatExceptionContext $context, int $code = 0, ?\Throwable $previous = null)
     {
         $this->context = $context;
 

Exception/PathException.php

@@ -18,7 +18,7 @@
  */
 final class PathException extends \RuntimeException implements ExceptionInterface
 {
-    public function __construct(string $path, int $code = 0, \Throwable $previous = null)
+    public function __construct(string $path, int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct(sprintf('Unable to read the "%s" environment file.', $path), $code, $previous);
     }