Merge branch '5.4' into 6.0

* 5.4:
  cs fix
  bug #45452 [Security] Fix UserNotFoundException is not thrown (damienfa)

Author: nicolas-grekas

Authenticator/Passport/Badge/UserBadge.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\EventListener\UserProviderListener;
 
@@ -60,20 +61,29 @@ public function getUserIdentifier(): string
      */
     public function getUser(): UserInterface
     {
-        if (!isset($this->user)) {
-            if (null === $this->userLoader) {
-                throw new \LogicException(sprintf('No user loader is configured, did you forget to register the "%s" listener?', UserProviderListener::class));
-            }
+        if (null !== $this->user) {
+            return $this->user;
+        }
+
+        if (null === $this->userLoader) {
+            throw new \LogicException(sprintf('No user loader is configured, did you forget to register the "%s" listener?', UserProviderListener::class));
+        }
 
-            $user = ($this->userLoader)($this->userIdentifier);
-            if (!$user instanceof UserInterface) {
-                throw new AuthenticationServiceException(sprintf('The user provider must return a UserInterface object, "%s" given.', get_debug_type($this->user)));
-            }
+        $user = ($this->userLoader)($this->userIdentifier);
+
+        // No user has been found via the $this->userLoader callback
+        if (null === $user) {
+            $exception = new UserNotFoundException();
+            $exception->setUserIdentifier($this->userIdentifier);
+
+            throw $exception;
+        }
 
-            $this->user = $user;
+        if (!$user instanceof UserInterface) {
+            throw new AuthenticationServiceException(sprintf('The user provider must return a UserInterface object, "%s" given.', get_debug_type($user)));
         }
 
-        return $this->user;
+        return $this->user = $user;
     }
 
     public function getUserLoader(): ?callable