Implement the new API for the user provider

Author: stof

Security/UserProvider.php

@@ -15,6 +15,7 @@
 use FOS\UserBundle\Model\UserManagerInterface;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
@@ -33,6 +34,17 @@ public function __construct(UserManagerInterface $userManager)
         $this->userManager = $userManager;
     }
 
+    public function loadUserByIdentifier(string $identifier): SecurityUserInterface
+    {
+        $user = $this->findUser($identifier);
+
+        if (!$user) {
+            throw new UserNotFoundException(sprintf('Username "%s" does not exist.', $identifier));
+        }
+
+        return $user;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -41,6 +53,10 @@ public function loadUserByUsername($username)
         $user = $this->findUser($username);
 
         if (!$user) {
+            if (class_exists(UserNotFoundException::class)) {
+                throw new UserNotFoundException(sprintf('Username "%s" does not exist.', $username));
+            }
+
             throw new UsernameNotFoundException(sprintf('Username "%s" does not exist.', $username));
         }
 
@@ -50,7 +66,7 @@ public function loadUserByUsername($username)
     /**
      * {@inheritdoc}
      */
-    public function refreshUser(SecurityUserInterface $user)
+    public function refreshUser(SecurityUserInterface $user): SecurityUserInterface
     {
         if (!$user instanceof UserInterface) {
             throw new UnsupportedUserException(sprintf('Expected an instance of FOS\UserBundle\Model\UserInterface, but got "%s".', get_class($user)));
@@ -61,6 +77,10 @@ public function refreshUser(SecurityUserInterface $user)
         }
 
         if (null === $reloadedUser = $this->userManager->findUserBy(['id' => $user->getId()])) {
+            if (class_exists(UserNotFoundException::class)) {
+                throw new UserNotFoundException(sprintf('User with ID "%s" could not be reloaded.', $user->getId()));
+            }
+
             throw new UsernameNotFoundException(sprintf('User with ID "%s" could not be reloaded.', $user->getId()));
         }
 
@@ -70,7 +90,7 @@ public function refreshUser(SecurityUserInterface $user)
     /**
      * {@inheritdoc}
      */
-    public function supportsClass($class)
+    public function supportsClass($class): bool
     {
         $userClass = $this->userManager->getClass();