Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ca77139

Browse filesBrowse files
Merge branch '5.3' into 5.4
* 5.3: Revert "minor #44175 [Ldap] Add missing security-http dependency (derrabus)"
2 parents f9ab38b + 5cb4027 commit ca77139
Copy full SHA for ca77139

File tree

Expand file treeCollapse file tree

2 files changed

+14
-4
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+14
-4
lines changed

‎src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ 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+
4448
$this->ldap = $this->createMock(LdapInterface::class);
4549
}
4650

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

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

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

103111
public function provideWrongPassportData()
104112
{
113+
if (!interface_exists(AuthenticatorInterface::class)) {
114+
$this->markTestSkipped('This test requires symfony/security-http:^5.1');
115+
}
116+
105117
// no password credentials
106118
yield [new SelfValidatingPassport(new UserBadge('test'), [new LdapBadge('app.ldap')])];
107119
}

‎src/Symfony/Component/Ldap/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Ldap/composer.json
+2-4Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
"ext-ldap": "*"
2323
},
2424
"require-dev": {
25-
"symfony/security-core": "^5.3|^6.0",
26-
"symfony/security-http": "^5.2|^6.0"
25+
"symfony/security-core": "^5.3|^6.0"
2726
},
2827
"conflict": {
2928
"symfony/options-resolver": "<4.4",
30-
"symfony/security-core": "<5.3",
31-
"symfony/security-http": "<5.2"
29+
"symfony/security-core": "<5.3"
3230
},
3331
"autoload": {
3432
"psr-4": { "Symfony\\Component\\Ldap\\": "" },

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.