fix merge

xabbuh · xabbuh · commit 61cf143727c9 · 2018-10-10T16:49:00.000+02:00
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -175,17 +175,13 @@ protected function refreshUser(TokenInterface $token)
 
                 // tokens can be deauthenticated if the user has been changed.
                 if (!$newToken->isAuthenticated()) {
-                    if ($this->logoutOnUserChange) {
-                        $userDeauthenticated = true;
+                    $userDeauthenticated = true;
 
-                        if (null !== $this->logger) {
-                            $this->logger->debug('Cannot refresh token because user has changed.', array('username' => $refreshedUser->getUsername(), 'provider' => \get_class($provider)));
-                        }
-
-                        continue;
+                    if (null !== $this->logger) {
+                        $this->logger->debug('Cannot refresh token because user has changed.', array('username' => $refreshedUser->getUsername(), 'provider' => \get_class($provider)));
                     }
 
-                    return null;
+                    continue;
                 }
 
                 $token->setUser($refreshedUser);
