Commit7d2ad4b

authored and

committed

Fix wrong roles comparison

1 parent47180fe commit7d2ad4bCopy full SHA for 7d2ad4b

File tree

-6

lines changed

src/Symfony/Component/Security/Core
- Authentication/Token
  - AbstractToken.php
- Tests/Authentication/Token
  - AbstractTokenTest.php

-6

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -317,13 +317,10 @@ private function hasUserChanged(UserInterface $user): bool`
`317`	`317`	`returntrue;`
`318`	`318`	`}`
`319`	`319`
	`320`	`+$currentUserRoles =array_map('strval', (array)$this->user->getRoles());`
`320`	`321`	`$userRoles =array_map('strval', (array)$user->getRoles());`
`321`	`322`
`322`		`-if ($thisinstanceof SwitchUserToken) {`
`323`		`-$userRoles[] ='ROLE_PREVIOUS_ADMIN';`
`324`		`- }`
`325`		`-`
`326`		`-if (\count($userRoles) !==\count($this->getRoleNames()) \|\|\count($userRoles) !==\count(array_intersect($userRoles,$this->getRoleNames()))) {`
	`323`	`+if (\count($userRoles) !==\count($currentUserRoles) \|\|\count($userRoles) !==\count(array_intersect($userRoles,$currentUserRoles))) {`
`327`	`324`	`returntrue;`
`328`	`325`	`}`
`329`	`326`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function getUserChangesAdvancedUser()`
`238`	`238`	`*/`
`239`	`239`	`publicfunctiontestSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)`
`240`	`240`	`{`
`241`		`-$token =newConcreteToken();`
	`241`	`+$token =newConcreteToken(['ROLE_FOO']);`
`242`	`242`	`$token->setAuthenticated(true);`
`243`	`243`	`$this->assertTrue($token->isAuthenticated());`
`244`	`244`

Comments

(0)