Merge branch '5.4' into 6.0

* 5.4:
  [SecurityHttp] Fix incompatibility with 6.0
  [SecurityGuard] Fix incompatibility with 6.0
  [SecurityBundle] Fix incompatibility with 6.0
  [FrameworkBundle] Fix incompatibility with 6.0
  [SecurityHttp] Fix incompatibility with 6.0
  [PasswordHasher] Fix incompatibility with 6.0
  [MonologBridge] Fix incompatibility with 6.0
  [Security] Minor fixes
  [Security] Fix wrong cache directive when using the new PUBLIC_ACCESS attribute

Author: wouterj

AuthenticationEvents.php

@@ -29,6 +29,8 @@ final class AuthenticationEvents
      * authenticated by any of the providers.
      *
      * @Event("Symfony\Component\Security\Core\Event\AuthenticationFailureEvent")
+     *
+     * @deprecated since Symfony 5.4, use {@see Event\LoginFailureEvent} instead
      */
     public const AUTHENTICATION_FAILURE = 'security.authentication.failure';
 

CHANGELOG.md

@@ -12,6 +12,7 @@ CHANGELOG
 5.4
 ---
 
+ * Deprecate `AuthenticationEvents::AUTHENTICATION_FAILURE`, use the `LoginFailureEvent` instead
  * Deprecate `AnonymousToken`, as the related authenticator was deprecated in 5.3
  * Deprecate `Token::getCredentials()`, tokens should no longer contain credentials (as they represent authenticated sessions)
  * Deprecate returning `string|\Stringable` from `Token::getUser()` (it must return a `UserInterface`)

User/ChainUserProvider.php

@@ -56,25 +56,25 @@ public function loadUserByUsername(string $username)
         return $this->loadUserByIdentifier($username);
     }
 
-    public function loadUserByIdentifier(string $userIdentifier): UserInterface
+    public function loadUserByIdentifier(string $identifier): UserInterface
     {
         foreach ($this->providers as $provider) {
             try {
                 // @deprecated since Symfony 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));
 
-                    return $provider->loadUserByUsername($userIdentifier);
+                    return $provider->loadUserByUsername($identifier);
                 }
 
-                return $provider->loadUserByIdentifier($userIdentifier);
+                return $provider->loadUserByIdentifier($identifier);
             } catch (UserNotFoundException $e) {
                 // try next one
             }
         }
 
-        $ex = new UserNotFoundException(sprintf('There is no user with identifier "%s".', $userIdentifier));
-        $ex->setUserIdentifier($userIdentifier);
+        $ex = new UserNotFoundException(sprintf('There is no user with identifier "%s".', $identifier));
+        $ex->setUserIdentifier($identifier);
         throw $ex;
     }