[Lock] 7.0 remove deprecations in Lock Component

Author: fafiebig

Authentication/Token/Storage/TokenStorage.php

@@ -40,12 +40,8 @@ public function getToken(): ?TokenInterface
     /**
      * @return void
      */
-    public function setToken(TokenInterface $token = null)
+    public function setToken(?TokenInterface $token)
     {
-        if (1 > \func_num_args()) {
-            trigger_deprecation('symfony/security-core', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
-        }
-
         if ($token) {
             // ensure any initializer is called
             $this->getToken();

Authorization/AuthorizationChecker.php

@@ -24,17 +24,10 @@
  */
 class AuthorizationChecker implements AuthorizationCheckerInterface
 {
-    private TokenStorageInterface $tokenStorage;
-    private AccessDecisionManagerInterface $accessDecisionManager;
-
-    public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionManagerInterface $accessDecisionManager, bool $exceptionOnNoToken = false)
-    {
-        if ($exceptionOnNoToken) {
-            throw new \LogicException(sprintf('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__));
-        }
-
-        $this->tokenStorage = $tokenStorage;
-        $this->accessDecisionManager = $accessDecisionManager;
+    public function __construct(
+        private TokenStorageInterface $tokenStorage,
+        private AccessDecisionManagerInterface $accessDecisionManager,
+    ) {
     }
 
     final public function isGranted(mixed $attribute, mixed $subject = null): bool

Security.php

@@ -24,19 +24,8 @@
  */
 class Security implements AuthorizationCheckerInterface
 {
-    /**
-     * @deprecated since Symfony 6.2, use \Symfony\Bundle\SecurityBundle\Security::ACCESS_DENIED_ERROR instead
-     */
     public const ACCESS_DENIED_ERROR = '_security.403_error';
-
-    /**
-     * @deprecated since Symfony 6.2, use \Symfony\Bundle\SecurityBundle\Security::AUTHENTICATION_ERROR instead
-     */
     public const AUTHENTICATION_ERROR = '_security.last_error';
-
-    /**
-     * @deprecated since Symfony 6.2, use \Symfony\Bundle\SecurityBundle\Security::LAST_USERNAME instead
-     */
     public const LAST_USERNAME = '_security.last_username';
 
     /**

Tests/Authentication/Token/Storage/TokenStorageTest.php

@@ -12,31 +12,12 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Token\Storage;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 
 class TokenStorageTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
-    /**
-     * @group legacy
-     */
-    public function testGetSetTokenLegacy()
-    {
-        $tokenStorage = new TokenStorage();
-        $token = new UsernamePasswordToken(new InMemoryUser('username', 'password'), 'provider');
-        $tokenStorage->setToken($token);
-        $this->assertSame($token, $tokenStorage->getToken());
-
-        $this->expectDeprecation('Since symfony/security-core 6.2: Calling "Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage::setToken()" without any arguments is deprecated, pass null explicitly instead.');
-
-        $tokenStorage->setToken();
-        $this->assertNull($tokenStorage->getToken());
-    }
-
     public function testGetSetToken()
     {
         $tokenStorage = new TokenStorage();

Tests/SecurityTest.php

@@ -46,14 +46,6 @@ public function getProviders(): array
         return $this->providers;
     }
 
-    /**
-     * @internal for compatibility with Symfony 5.4
-     */
-    public function loadUserByUsername(string $username): UserInterface
-    {
-        return $this->loadUserByIdentifier($username);
-    }
-
     public function loadUserByIdentifier(string $identifier): UserInterface
     {
         foreach ($this->providers as $provider) {

User/ChainUserProvider.php

@@ -51,13 +51,11 @@ public function __construct(array $users = [])
      * Adds a new User to the provider.
      *
      * @return void
-     *
-     * @throws \LogicException
      */
     public function createUser(UserInterface $user)
     {
         if (!$user instanceof InMemoryUser) {
-            trigger_deprecation('symfony/security-core', '6.3', 'Passing users that are not instance of "%s" to "%s" is deprecated, "%s" given.', InMemoryUser::class, __METHOD__, get_debug_type($user));
+            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_debug_type($user)));
         }
 
         $userIdentifier = strtolower($user->getUserIdentifier());
@@ -93,13 +91,11 @@ public function supportsClass(string $class): bool
     }
 
     /**
-     * Returns the user by given username.
-     *
-     * @return InMemoryUser change return type on 7.0
+     * Returns the user by given user.
      *
      * @throws UserNotFoundException if user whose given username does not exist
      */
-    private function getUser(string $username): UserInterface
+    private function getUser(string $username): InMemoryUser
     {
         if (!isset($this->users[strtolower($username)])) {
             $ex = new UserNotFoundException(sprintf('Username "%s" does not exist.', $username));