Merge branch '5.2' into 5.3

* 5.2:
  CS fix
  CS fix
  CS fixes
  Bump Symfony version to 5.2.12
  Update VERSION for 5.2.11
  Update CHANGELOG for 5.2.11
  Bump Symfony version to 4.4.27
  Update VERSION for 4.4.26
  Update CONTRIBUTORS for 4.4.26
  Update CHANGELOG for 4.4.26

Author: nicolas-grekas

Authentication/Token/AbstractToken.php

@@ -53,7 +53,7 @@ public function getRoleNames(): array
      */
     public function getUsername(/* $legacy = true */)
     {
-        if (1 === func_num_args() && false === func_get_arg(0)) {
+        if (1 === \func_num_args() && false === func_get_arg(0)) {
             return null;
         }
 

Encoder/PasswordHasherAdapter.php

@@ -29,12 +29,12 @@ public function __construct(PasswordEncoderInterface $passwordEncoder)
         $this->passwordEncoder = $passwordEncoder;
     }
 
-    public function hash(string $plainPassword, ?string $salt = null): string
+    public function hash(string $plainPassword, string $salt = null): string
     {
         return $this->passwordEncoder->encodePassword($plainPassword, $salt);
     }
 
-    public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool
+    public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool
     {
         return $this->passwordEncoder->isPasswordValid($hashedPassword, $plainPassword, $salt);
     }

Signature/SignatureHasher.php

@@ -12,10 +12,9 @@
 namespace Symfony\Component\Security\Core\Signature;
 
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\Signature\Exception\ExpiredSignatureException;
 use Symfony\Component\Security\Core\Signature\Exception\InvalidSignatureException;
-use Symfony\Component\Security\Core\Signature\ExpiredSignatureStorage;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Creates and validates secure hashes used in login links and remember-me cookies.
@@ -36,7 +35,7 @@ class SignatureHasher
      * @param ExpiredSignatureStorage|null $expiredSignaturesStorage if provided, secures a sequence of hashes that are expired
      * @param int|null                     $maxUses                  used together with $expiredSignatureStorage to allow a maximum usage of a hash
      */
-    public function __construct(PropertyAccessorInterface $propertyAccessor, array $signatureProperties, string $secret, ?ExpiredSignatureStorage $expiredSignaturesStorage = null, ?int $maxUses = null)
+    public function __construct(PropertyAccessorInterface $propertyAccessor, array $signatureProperties, string $secret, ExpiredSignatureStorage $expiredSignaturesStorage = null, int $maxUses = null)
     {
         $this->propertyAccessor = $propertyAccessor;
         $this->signatureProperties = $signatureProperties;

Tests/Authentication/Provider/DaoAuthenticationProviderTest.php

@@ -385,6 +385,7 @@ public function eraseCredentials()
 interface PasswordUpgraderProvider extends UserProviderInterface, PasswordUpgraderInterface
 {
     public function upgradePassword(UserInterface $user, string $newHashedPassword): void;
+
     public function loadUserByIdentifier(string $identifier): UserInterface;
 }
 

Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php

@@ -21,7 +21,6 @@
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 /**
  * @group legacy

Tests/Authentication/Token/AbstractTokenTest.php

@@ -33,23 +33,27 @@ public function testLegacyGetUsername()
         $token->setUser(new TestUser('fabien'));
         $this->assertEquals('fabien', $token->getUsername());
 
-        $legacyUser = new class implements UserInterface {
+        $legacyUser = new class() implements UserInterface {
             public function getUsername()
             {
                 return 'fabien';
             }
 
             public function getRoles()
-            {}
+            {
+            }
 
             public function getPassword()
-            {}
+            {
+            }
 
             public function getSalt()
-            {}
+            {
+            }
 
             public function eraseCredentials()
-            {}
+            {
+            }
         };
         $token->setUser($legacyUser);
         $this->assertEquals('fabien', $token->getUsername());

Tests/User/ChainUserProviderTest.php

@@ -20,7 +20,6 @@
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 class ChainUserProviderTest extends TestCase
 {

User/ChainUserProvider.php

@@ -62,7 +62,7 @@ public function loadUserByIdentifier(string $userIdentifier): UserInterface
             try {
                 // @deprecated since 5.3, change to $provider->loadUserByIdentifier() in 6.0
                 if (!method_exists($provider, 'loadUserByIdentifier')) {
-                    trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', \get_debug_type($provider));
+                    trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', get_debug_type($provider));
 
                     return $provider->loadUserByUsername($userIdentifier);
                 }

User/UserChecker.php

@@ -11,11 +11,6 @@
 
 namespace Symfony\Component\Security\Core\User;
 
-use Symfony\Component\Security\Core\Exception\AccountExpiredException;
-use Symfony\Component\Security\Core\Exception\CredentialsExpiredException;
-use Symfony\Component\Security\Core\Exception\DisabledException;
-use Symfony\Component\Security\Core\Exception\LockedException;
-
 trigger_deprecation('symfony/security-core', '5.3', 'The "%s" class is deprecated, use "%s" instead.', UserChecker::class, InMemoryUserChecker::class);
 
 class_exists(InMemoryUserChecker::class);