From 61cf143727c97c2722745ff69868465a2d80c4a0 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Wed, 10 Oct 2018 16:48:55 +0200
Subject: [PATCH] fix merge

---
 .../Security/Http/Firewall/ContextListener.php       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index cce915a045..0c64be8640 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -175,17 +175,13 @@ class ContextListener implements ListenerInterface
 
                 // 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);