[Lock] 7.0 remove deprecations in Lock Component

Author: fafiebig

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.0
+---
+
+ * Remove `{username}` parameter, use `{user_identifier}` instead
+
 6.2
 ---
 

Security/LdapBadge.php

@@ -34,18 +34,10 @@ class LdapBadge implements BadgeInterface
     public function __construct(string $ldapServiceId, string $dnString = '{user_identifier}', string $searchDn = '', string $searchPassword = '', string $queryString = null)
     {
         $this->ldapServiceId = $ldapServiceId;
-        $dnString = str_replace('{username}', '{user_identifier}', $dnString, $replaceCount);
-        if ($replaceCount > 0) {
-            trigger_deprecation('symfony/ldap', '6.2', 'Using "{username}" parameter in LDAP configuration is deprecated, consider using "{user_identifier}" instead.');
-        }
         $this->dnString = $dnString;
         $this->searchDn = $searchDn;
         $this->searchPassword = $searchPassword;
-        $queryString = str_replace('{username}', '{user_identifier}', $queryString ?? '', $replaceCount);
-        if ($replaceCount > 0) {
-            trigger_deprecation('symfony/ldap', '6.2', 'Using "{username}" parameter in LDAP configuration is deprecated, consider using "{user_identifier}" instead.');
-        }
-        $this->queryString = $queryString;
+        $this->queryString = $queryString ?? '';
     }
 
     public function getLdapServiceId(): string

Security/LdapUser.php

@@ -62,14 +62,6 @@ public function getSalt(): ?string
         return null;
     }
 
-    /**
-     * @internal for compatibility with Symfony 5.4
-     */
-    public function getUsername(): string
-    {
-        return $this->getUserIdentifier();
-    }
-
     public function getUserIdentifier(): string
     {
         return $this->identifier;

Security/LdapUserProvider.php

@@ -59,14 +59,6 @@ public function __construct(LdapInterface $ldap, string $baseDn, string $searchD
         $this->extraFields = $extraFields;
     }
 
-    /**
-     * @internal for compatibility with Symfony 5.4
-     */
-    public function loadUserByUsername(string $username): UserInterface
-    {
-        return $this->loadUserByIdentifier($username);
-    }
-
     public function loadUserByIdentifier(string $identifier): UserInterface
     {
         try {
@@ -76,11 +68,7 @@ public function loadUserByIdentifier(string $identifier): UserInterface
         }
 
         $identifier = $this->ldap->escape($identifier, '', LdapInterface::ESCAPE_FILTER);
-        $query = str_replace('{username}', '{user_identifier}', $this->defaultSearch, $replaceCount);
-        if ($replaceCount > 0) {
-            trigger_deprecation('symfony/ldap', '6.2', 'Using "{username}" parameter in LDAP configuration is deprecated, consider using "{user_identifier}" instead.');
-        }
-        $query = str_replace('{user_identifier}', $identifier, $query);
+        $query = str_replace('{user_identifier}', $identifier, $this->defaultSearch);
         $search = $this->ldap->query($this->baseDn, $query, ['filter' => 0 == \count($this->extraFields) ? '*' : $this->extraFields]);
 
         $entries = $search->execute();

Tests/Security/CheckLdapCredentialsListenerTest.php

@@ -30,7 +30,6 @@
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
-use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
 use Symfony\Component\Security\Http\Event\CheckPassportEvent;
 use Symfony\Contracts\Service\ServiceLocatorTrait;
@@ -127,49 +126,6 @@ public function testBindFailureShouldThrowAnException()
         $listener->onCheckPassport($this->createEvent());
     }
 
-    /**
-     * @group legacy
-     *
-     * @dataProvider queryForDnProvider
-     */
-    public function testLegacyQueryForDn(string $dnString, string $queryString)
-    {
-        $collection = new class([new Entry('')]) extends \ArrayObject implements CollectionInterface {
-            public function toArray(): array
-            {
-                return $this->getArrayCopy();
-            }
-        };
-
-        $query = $this->createMock(QueryInterface::class);
-        $query->expects($this->once())->method('execute')->willReturn($collection);
-
-        $this->ldap
-            ->method('bind')
-            ->willReturnCallback(function (...$args) {
-                static $series = [
-                    ['elsa', 'test1234A$'],
-                    ['', 's3cr3t'],
-                ];
-
-                $this->assertSame(array_shift($series), $args);
-            })
-        ;
-        $this->ldap->expects($this->any())->method('escape')->with('Wouter', '', LdapInterface::ESCAPE_FILTER)->willReturn('wouter');
-        $this->ldap->expects($this->once())->method('query')->with('{user_identifier}', 'wouter_test')->willReturn($query);
-
-        $listener = $this->createListener();
-        $listener->onCheckPassport($this->createEvent('s3cr3t', new LdapBadge('app.ldap', $dnString, 'elsa', 'test1234A$', $queryString)));
-    }
-
-    public static function queryForDnProvider(): iterable
-    {
-        yield ['{username}', '{username}_test'];
-        yield ['{user_identifier}', '{username}_test'];
-        yield ['{username}', '{user_identifier}_test'];
-        yield ['{user_identifier}', '{user_identifier}_test'];
-    }
-
     public function testQueryForDn()
     {
         $collection = new class([new Entry('')]) extends \ArrayObject implements CollectionInterface {
@@ -257,13 +213,6 @@ public function authenticate(Request $request): Passport
         {
         }
 
-        /**
-         * @internal for compatibility with Symfony 5.4
-         */
-        public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
-        {
-        }
-
         public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
         {
         }

composer.json

@@ -18,7 +18,6 @@
     "require": {
         "php": ">=8.2",
         "ext-ldap": "*",
-        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/options-resolver": "^6.4|^7.0"
     },
     "require-dev": {