symfony
diff --git a/‎Authentication/Token/AbstractToken.php
Copy file name to clipboardExpand all lines: Authentication/Token/AbstractToken.php
+2-5Lines changed: 2 additions & 5 deletions b/‎Authentication/Token/AbstractToken.php
Copy file name to clipboardExpand all lines: Authentication/Token/AbstractToken.php
+2-5Lines changed: 2 additions & 5 deletions
diff --git a/‎Tests/Authentication/Token/AbstractTokenTest.php
Copy file name to clipboardExpand all lines: Tests/Authentication/Token/AbstractTokenTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎Tests/Authentication/Token/AbstractTokenTest.php
Copy file name to clipboardExpand all lines: Tests/Authentication/Token/AbstractTokenTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -270,13 +270,10 @@ private function hasUserChanged(UserInterface $user): bool
             return true;
         }
 
+        $currentUserRoles = array_map('strval', (array) $this->user->getRoles());
         $userRoles = array_map('strval', (array) $user->getRoles());
 
-        if ($this instanceof SwitchUserToken) {
-            $userRoles[] = 'ROLE_PREVIOUS_ADMIN';
-        }
-
-        if (\count($userRoles) !== \count($this->getRoleNames()) || \count($userRoles) !== \count(array_intersect($userRoles, $this->getRoleNames()))) {
+        if (\count($userRoles) !== \count($currentUserRoles) || \count($userRoles) !== \count(array_intersect($userRoles, $currentUserRoles))) {
             return true;
         }
 
 
@@ -152,7 +152,7 @@ public function getUserChanges()
      */
     public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)
     {
-        $token = new ConcreteToken();
+        $token = new ConcreteToken(['ROLE_FOO']);
         $token->setAuthenticated(true);
         $this->assertTrue($token->isAuthenticated());
Original file line number	Diff line number	Diff line change
`@@ -270,13 +270,10 @@ private function hasUserChanged(UserInterface $user): bool`
`270`	`270`	`return true;`
`271`	`271`	`}`
`272`	`272`
	`273`	`+ $currentUserRoles = array_map('strval', (array) $this->user->getRoles());`
`273`	`274`	`$userRoles = array_map('strval', (array) $user->getRoles());`
`274`	`275`
`275`		`- if ($this instanceof SwitchUserToken) {`
`276`		`- $userRoles[] = 'ROLE_PREVIOUS_ADMIN';`
`277`		`- }`
`278`		`-`
`279`		`- if (\count($userRoles) !== \count($this->getRoleNames()) \|\| \count($userRoles) !== \count(array_intersect($userRoles, $this->getRoleNames()))) {`
	`276`	`+ if (\count($userRoles) !== \count($currentUserRoles) \|\| \count($userRoles) !== \count(array_intersect($userRoles, $currentUserRoles))) {`
`280`	`277`	`return true;`
`281`	`278`	`}`
`282`	`279`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function getUserChanges()`
`152`	`152`	`*/`
`153`	`153`	`public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)`
`154`	`154`	`{`
`155`		`- $token = new ConcreteToken();`
	`155`	`+ $token = new ConcreteToken(['ROLE_FOO']);`
`156`	`156`	`$token->setAuthenticated(true);`
`157`	`157`	`$this->assertTrue($token->isAuthenticated());`
`158`	`158`