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

Adapter/ConnectionInterface.php

@@ -34,5 +34,5 @@ public function isBound(): bool;
      * @throws ConnectionTimeoutException  When the connection can't be created because of an LDAP_TIMEOUT error
      * @throws InvalidCredentialsException When the connection can't be created because of an LDAP_INVALID_CREDENTIALS error
      */
-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void;
+    public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null): void;
 }

Adapter/ExtLdap/Connection.php

@@ -62,7 +62,7 @@ public function isBound(): bool
     /**
      * @param string $password WARNING: When the LDAP server allows unauthenticated binds, a blank $password will always be valid
      */
-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void
+    public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null): void
     {
         if (!$this->connection) {
             $this->connect();

Ldap.php

@@ -29,7 +29,7 @@ public function __construct(AdapterInterface $adapter)
         $this->adapter = $adapter;
     }
 
-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void
+    public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null): void
     {
         $this->adapter->getConnection()->bind($dn, $password);
     }

LdapInterface.php

@@ -30,7 +30,7 @@ interface LdapInterface
      *
      * @throws ConnectionException if dn / password could not be bound
      */
-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void;
+    public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null): void;
 
     /**
      * Queries a ldap server for entries matching the given criteria.

Security/LdapAuthenticator.php

@@ -80,7 +80,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(sprintf('Decorated authenticator "%s" does not implement interface "%s".', get_debug_type($this->authenticator), AuthenticationEntryPointInterface::class));

Security/LdapBadge.php

@@ -31,7 +31,7 @@ class LdapBadge implements BadgeInterface
     private string $searchPassword;
     private ?string $queryString;
 
-    public function __construct(string $ldapServiceId, string $dnString = '{user_identifier}', string $searchDn = '', string $searchPassword = '', string $queryString = null)
+    public function __construct(string $ldapServiceId, string $dnString = '{user_identifier}', string $searchDn = '', string $searchPassword = '', ?string $queryString = null)
     {
         $this->ldapServiceId = $ldapServiceId;
         $this->dnString = $dnString;

Security/LdapUserProvider.php

@@ -45,7 +45,7 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa
     private ?string $passwordAttribute;
     private array $extraFields;
 
-    public function __construct(LdapInterface $ldap, string $baseDn, string $searchDn = null, #[\SensitiveParameter] string $searchPassword = null, array $defaultRoles = [], string $uidKey = null, string $filter = null, string $passwordAttribute = null, array $extraFields = [])
+    public function __construct(LdapInterface $ldap, string $baseDn, ?string $searchDn = null, #[\SensitiveParameter] ?string $searchPassword = null, array $defaultRoles = [], ?string $uidKey = null, ?string $filter = null, ?string $passwordAttribute = null, array $extraFields = [])
     {
         $uidKey ??= 'sAMAccountName';
         $filter ??= '({uid_key}={user_identifier})';