Merge branch '5.4' into 6.3

* 5.4:
  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

Authentication/AuthenticationTrustResolver.php

@@ -21,17 +21,17 @@
  */
 class AuthenticationTrustResolver implements AuthenticationTrustResolverInterface
 {
-    public function isAuthenticated(TokenInterface $token = null): bool
+    public function isAuthenticated(?TokenInterface $token = null): bool
     {
         return $token && $token->getUser();
     }
 
-    public function isRememberMe(TokenInterface $token = null): bool
+    public function isRememberMe(?TokenInterface $token = null): bool
     {
         return $token && $token instanceof RememberMeToken;
     }
 
-    public function isFullFledged(TokenInterface $token = null): bool
+    public function isFullFledged(?TokenInterface $token = null): bool
     {
         return $this->isAuthenticated($token) && !$this->isRememberMe($token);
     }

Authentication/AuthenticationTrustResolverInterface.php

@@ -23,16 +23,16 @@ interface AuthenticationTrustResolverInterface
     /**
      * Resolves whether the passed token implementation is authenticated.
      */
-    public function isAuthenticated(TokenInterface $token = null): bool;
+    public function isAuthenticated(?TokenInterface $token = null): bool;
 
     /**
      * Resolves whether the passed token implementation is authenticated
      * using remember-me capabilities.
      */
-    public function isRememberMe(TokenInterface $token = null): bool;
+    public function isRememberMe(?TokenInterface $token = null): bool;
 
     /**
      * Resolves whether the passed token implementation is fully authenticated.
      */
-    public function isFullFledged(TokenInterface $token = null): bool;
+    public function isFullFledged(?TokenInterface $token = null): bool;
 }

Authentication/Token/Storage/TokenStorage.php

@@ -40,7 +40,7 @@ public function getToken(): ?TokenInterface
     /**
      * @return void
      */
-    public function setToken(TokenInterface $token = null)
+    public function setToken(?TokenInterface $token = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/security-core', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);

Authentication/Token/Storage/UsageTrackingTokenStorage.php

@@ -44,7 +44,7 @@ public function getToken(): ?TokenInterface
         return $this->storage->getToken();
     }
 
-    public function setToken(TokenInterface $token = null): void
+    public function setToken(?TokenInterface $token = null): void
     {
         $this->storage->setToken($token);
 

Authentication/Token/SwitchUserToken.php

@@ -29,7 +29,7 @@ class SwitchUserToken extends UsernamePasswordToken
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(UserInterface $user, string $firewallName, array $roles, TokenInterface $originalToken, string $originatedFromUri = null)
+    public function __construct(UserInterface $user, string $firewallName, array $roles, TokenInterface $originalToken, ?string $originatedFromUri = null)
     {
         parent::__construct($user, $firewallName, $roles);
 

Authorization/AccessDecisionManager.php

@@ -40,7 +40,7 @@ final class AccessDecisionManager implements AccessDecisionManagerInterface
     /**
      * @param iterable<mixed, VoterInterface> $voters An array or an iterator of VoterInterface instances
      */
-    public function __construct(iterable $voters = [], AccessDecisionStrategyInterface $strategy = null)
+    public function __construct(iterable $voters = [], ?AccessDecisionStrategyInterface $strategy = null)
     {
         $this->voters = $voters;
         $this->strategy = $strategy ?? new AffirmativeStrategy();

Authorization/ExpressionLanguage.php

@@ -29,7 +29,7 @@ class_exists(ExpressionLanguageProvider::class);
      */
     class ExpressionLanguage extends BaseExpressionLanguage
     {
-        public function __construct(CacheItemPoolInterface $cache = null, array $providers = [])
+        public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [])
         {
             // prepend the default provider to let users override it easily
             array_unshift($providers, new ExpressionLanguageProvider());

Authorization/Voter/ExpressionVoter.php

@@ -31,7 +31,7 @@ class ExpressionVoter implements CacheableVoterInterface
     private AuthorizationCheckerInterface $authChecker;
     private ?RoleHierarchyInterface $roleHierarchy;
 
-    public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, RoleHierarchyInterface $roleHierarchy = null)
+    public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, ?RoleHierarchyInterface $roleHierarchy = null)
     {
         $this->expressionLanguage = $expressionLanguage;
         $this->trustResolver = $trustResolver;

Encoder/NativePasswordEncoder.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Encoder;
+
+use Symfony\Component\PasswordHasher\Hasher\NativePasswordHasher;
+
+trigger_deprecation('symfony/security-core', '5.3', 'The "%s" class is deprecated, use "%s" instead.', NativePasswordEncoder::class, NativePasswordHasher::class);
+
+/**
+ * Hashes passwords using password_hash().
+ *
+ * @author Elnur Abdurrakhimov <elnur@elnur.pro>
+ * @author Terje Bråten <terje@braten.be>
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @deprecated since Symfony 5.3, use {@link NativePasswordHasher} instead
+ */
+final class NativePasswordEncoder implements PasswordEncoderInterface, SelfSaltingEncoderInterface
+{
+    use LegacyEncoderTrait;
+
+    /**
+     * @param string|null $algo An algorithm supported by password_hash() or null to use the stronger available algorithm
+     */
+    public function __construct(?int $opsLimit = null, ?int $memLimit = null, ?int $cost = null, ?string $algo = null)
+    {
+        $this->hasher = new NativePasswordHasher($opsLimit, $memLimit, $cost, $algo);
+    }
+}

Encoder/PasswordHasherAdapter.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Encoder;
+
+use Symfony\Component\PasswordHasher\LegacyPasswordHasherInterface;
+
+/**
+ * Forward compatibility for new new PasswordHasher component.
+ *
+ * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @internal To be removed in Symfony 6
+ */
+final class PasswordHasherAdapter implements LegacyPasswordHasherInterface
+{
+    private $passwordEncoder;
+
+    public function __construct(PasswordEncoderInterface $passwordEncoder)
+    {
+        $this->passwordEncoder = $passwordEncoder;
+    }
+
+    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
+    {
+        return $this->passwordEncoder->isPasswordValid($hashedPassword, $plainPassword, $salt);
+    }
+
+    public function needsRehash(string $hashedPassword): bool
+    {
+        return $this->passwordEncoder->needsRehash($hashedPassword);
+    }
+}