Merge branch '5.4' into 6.0

* 5.4:
  Fix bad merge

Author: nicolas-grekas

Tests/Security/CheckLdapCredentialsListenerTest.php

@@ -230,9 +230,9 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
         public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
         {
         }
-    }
 
-    public function createToken(Passport $passport, string $firewallName): TokenInterface
-    {
+        public function createToken(Passport $passport, string $firewallName): TokenInterface
+        {
+        }
     }
 }