Merge branch '5.4' into 6.0

* 5.4:
  Fix test
  [Ldap] Add missing security-http dependency
  [SecurityBundle] There is no Guard 6
  Guard is incompatible with Symfony 6
  [Tests] Remove some unused fixtures

Author: derrabus

Tests/Security/CheckLdapCredentialsListenerTest.php

@@ -40,10 +40,6 @@ class CheckLdapCredentialsListenerTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!interface_exists(AuthenticatorInterface::class)) {
-            $this->markTestSkipped('This test requires symfony/security-http:^5.1');
-        }
-
         $this->ldap = $this->createMock(LdapInterface::class);
     }
 
@@ -60,10 +56,6 @@ public function testShouldNotCheckPassport($authenticator, $passport)
 
     public function provideShouldNotCheckPassport()
     {
-        if (!interface_exists(AuthenticatorInterface::class)) {
-            $this->markTestSkipped('This test requires symfony/security-http:^5.1');
-        }
-
         // no LdapBadge
         yield [new TestAuthenticator(), new Passport(new UserBadge('test'), new PasswordCredentials('s3cret'))];
 
@@ -109,10 +101,6 @@ public function testWrongPassport($passport)
 
     public function provideWrongPassportData()
     {
-        if (!interface_exists(AuthenticatorInterface::class)) {
-            $this->markTestSkipped('This test requires symfony/security-http:^5.1');
-        }
-
         // no password credentials
         yield [new SelfValidatingPassport(new UserBadge('test'), [new LdapBadge('app.ldap')])];
     }
@@ -204,31 +192,29 @@ private function createListener()
     }
 }
 
-if (interface_exists(AuthenticatorInterface::class)) {
-    class TestAuthenticator implements AuthenticatorInterface
+class TestAuthenticator implements AuthenticatorInterface
+{
+    public function supports(Request $request): ?bool
     {
-        public function supports(Request $request): ?bool
-        {
-        }
+    }
 
-        public function authenticate(Request $request): Passport
-        {
-        }
+    public function authenticate(Request $request): Passport
+    {
+    }
 
-        public function createAuthenticatedToken(Passport $passport, string $firewallName): TokenInterface
-        {
-        }
+    public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
+    {
+    }
 
-        public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
-        {
-        }
+    public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
+    {
+    }
 
-        public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
-        {
-        }
+    public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
+    {
+    }
 
-        public function createToken(Passport $passport, string $firewallName): TokenInterface
-        {
-        }
+    public function createToken(Passport $passport, string $firewallName): TokenInterface
+    {
     }
 }

composer.json

@@ -21,11 +21,13 @@
         "symfony/options-resolver": "^5.4|^6.0"
     },
     "require-dev": {
-        "symfony/security-core": "^5.4|^6.0"
+        "symfony/security-core": "^5.4|^6.0",
+        "symfony/security-http": "^5.4|^6.0"
     },
     "conflict": {
         "symfony/options-resolver": "<5.4",
-        "symfony/security-core": "<5.4"
+        "symfony/security-core": "<5.4",
+        "symfony/security-http": "<5.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Ldap\\": "" },