Skip to content

Commit f74eaaf

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Fix test [Ldap] Add missing security-http dependency
2 parents 6d0e438 + 57c2170 commit f74eaaf

File tree

2 files changed

+22
-34
lines changed

2 files changed

+22
-34
lines changed

Tests/Security/CheckLdapCredentialsListenerTest.php

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ class CheckLdapCredentialsListenerTest extends TestCase
4141

4242
protected function setUp(): void
4343
{
44-
if (!interface_exists(AuthenticatorInterface::class)) {
45-
$this->markTestSkipped('This test requires symfony/security-http:^5.1');
46-
}
47-
4844
$this->ldap = $this->createMock(LdapInterface::class);
4945
}
5046

@@ -61,10 +57,6 @@ public function testShouldNotCheckPassport($authenticator, $passport)
6157

6258
public function provideShouldNotCheckPassport()
6359
{
64-
if (!interface_exists(AuthenticatorInterface::class)) {
65-
$this->markTestSkipped('This test requires symfony/security-http:^5.1');
66-
}
67-
6860
// no LdapBadge
6961
yield [new TestAuthenticator(), new Passport(new UserBadge('test'), new PasswordCredentials('s3cret'))];
7062

@@ -110,10 +102,6 @@ public function testWrongPassport($passport)
110102

111103
public function provideWrongPassportData()
112104
{
113-
if (!interface_exists(AuthenticatorInterface::class)) {
114-
$this->markTestSkipped('This test requires symfony/security-http:^5.1');
115-
}
116-
117105
// no password credentials
118106
yield [new SelfValidatingPassport(new UserBadge('test'), [new LdapBadge('app.ldap')])];
119107
}
@@ -222,31 +210,29 @@ private function createListener()
222210
}
223211
}
224212

225-
if (interface_exists(AuthenticatorInterface::class)) {
226-
class TestAuthenticator implements AuthenticatorInterface
213+
class TestAuthenticator implements AuthenticatorInterface
214+
{
215+
public function supports(Request $request): ?bool
227216
{
228-
public function supports(Request $request): ?bool
229-
{
230-
}
217+
}
231218

232-
public function authenticate(Request $request): PassportInterface
233-
{
234-
}
219+
public function authenticate(Request $request): Passport
220+
{
221+
}
235222

236-
public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
237-
{
238-
}
223+
public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
224+
{
225+
}
239226

240-
public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
241-
{
242-
}
227+
public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
228+
{
229+
}
243230

244-
public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
245-
{
246-
}
231+
public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
232+
{
233+
}
247234

248-
public function createToken(Passport $passport, string $firewallName): TokenInterface
249-
{
250-
}
235+
public function createToken(Passport $passport, string $firewallName): TokenInterface
236+
{
251237
}
252238
}

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
"ext-ldap": "*"
2323
},
2424
"require-dev": {
25-
"symfony/security-core": "^5.3|^6.0"
25+
"symfony/security-core": "^5.3|^6.0",
26+
"symfony/security-http": "^5.2|^6.0"
2627
},
2728
"conflict": {
2829
"symfony/options-resolver": "<4.4",
29-
"symfony/security-core": "<5.3"
30+
"symfony/security-core": "<5.3",
31+
"symfony/security-http": "<5.2"
3032
},
3133
"autoload": {
3234
"psr-4": { "Symfony\\Component\\Ldap\\": "" },

0 commit comments

Comments
 (0)