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

AccessMap.php

@@ -28,7 +28,7 @@ class AccessMap implements AccessMapInterface
      * @param array       $attributes An array of attributes to pass to the access decision manager (like roles)
      * @param string|null $channel    The channel to enforce (http, https, or null)
      */
-    public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], string $channel = null): void
+    public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], ?string $channel = null): void
     {
         $this->map[] = [$requestMatcher, $attributes, $channel];
     }

Authentication/AuthenticatorManager.php

@@ -58,7 +58,7 @@ class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthent
     /**
      * @param iterable<mixed, AuthenticatorInterface> $authenticators
      */
-    public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])
+    public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, ?LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])
     {
         $this->authenticators = $authenticators;
         $this->tokenStorage = $tokenStorage;

Authentication/DefaultAuthenticationFailureHandler.php

@@ -43,7 +43,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
         'failure_path_parameter' => '_failure_path',
     ];
 
-    public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], LoggerInterface $logger = null)
+    public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null)
     {
         $this->httpKernel = $httpKernel;
         $this->httpUtils = $httpUtils;

Authentication/DefaultAuthenticationSuccessHandler.php

@@ -45,7 +45,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
     /**
      * @param array $options Options for processing a successful authentication attempt
      */
-    public function __construct(HttpUtils $httpUtils, array $options = [], LoggerInterface $logger = null)
+    public function __construct(HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null)
     {
         $this->httpUtils = $httpUtils;
         $this->logger = $logger;

Authenticator/AbstractLoginFormAuthenticator.php

@@ -60,7 +60,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
      * Override to control what happens when the user hits a secure page
      * but isn't logged in yet.
      */
-    public function start(Request $request, AuthenticationException $authException = null): Response
+    public function start(Request $request, ?AuthenticationException $authException = null): Response
     {
         $url = $this->getLoginUrl($request);
 

Authenticator/AbstractPreAuthenticatedAuthenticator.php

@@ -41,7 +41,7 @@ abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthe
     private string $firewallName;
     private ?LoggerInterface $logger;
 
-    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, LoggerInterface $logger = null)
+    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, ?LoggerInterface $logger = null)
     {
         $this->userProvider = $userProvider;
         $this->tokenStorage = $tokenStorage;

Authenticator/AccessTokenAuthenticator.php

@@ -103,7 +103,7 @@ public function setTranslator(?TranslatorInterface $translator): void
     /**
      * @see https://datatracker.ietf.org/doc/html/rfc6750#section-3
      */
-    private function getAuthenticateHeader(string $errorDescription = null): string
+    private function getAuthenticateHeader(?string $errorDescription = null): string
     {
         $data = [
             'realm' => $this->realm,

Authenticator/Debug/TraceableAuthenticator.php

@@ -92,7 +92,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
         return $this->authenticator->onAuthenticationFailure($request, $exception);
     }
 
-    public function start(Request $request, AuthenticationException $authException = null): Response
+    public function start(Request $request, ?AuthenticationException $authException = null): Response
     {
         if (!$this->authenticator instanceof AuthenticationEntryPointInterface) {
             throw new NotAnEntryPointException();

Authenticator/FormLoginAuthenticator.php

@@ -143,7 +143,7 @@ public function setHttpKernel(HttpKernelInterface $httpKernel): void
         $this->httpKernel = $httpKernel;
     }
 
-    public function start(Request $request, AuthenticationException $authException = null): Response
+    public function start(Request $request, ?AuthenticationException $authException = null): Response
     {
         if (!$this->options['use_forward']) {
             return parent::start($request, $authException);

Authenticator/HttpBasicAuthenticator.php

@@ -37,14 +37,14 @@ class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEn
     private UserProviderInterface $userProvider;
     private ?LoggerInterface $logger;
 
-    public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null)
+    public function __construct(string $realmName, UserProviderInterface $userProvider, ?LoggerInterface $logger = null)
     {
         $this->realmName = $realmName;
         $this->userProvider = $userProvider;
         $this->logger = $logger;
     }
 
-    public function start(Request $request, AuthenticationException $authException = null): Response
+    public function start(Request $request, ?AuthenticationException $authException = null): Response
     {
         $response = new Response();
         $response->headers->set('WWW-Authenticate', sprintf('Basic realm="%s"', $this->realmName));