Skip to content

Commit 9d3a49f

Browse files
committed
When method name is hasUserChanged the return boolean should be true
(to match question semantics) and false when user has not changed, this commits inverts return statements.
1 parent c57b528 commit 9d3a49f

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function setUser($user)
8989
if (!$user instanceof UserInterface) {
9090
$changed = true;
9191
} else {
92-
$changed = !$this->hasUserChanged($user);
92+
$changed = $this->hasUserChanged($user);
9393
}
9494
} elseif ($user instanceof UserInterface) {
9595
$changed = true;
@@ -230,41 +230,41 @@ private function hasUserChanged(UserInterface $user)
230230
}
231231

232232
if ($this->user instanceof EquatableInterface) {
233-
return $this->user->isEqualTo($user);
233+
return !$this->user->isEqualTo($user);
234234
}
235235

236236
if ($this->user->getPassword() !== $user->getPassword()) {
237-
return false;
237+
return true;
238238
}
239239

240240
if ($this->user->getSalt() !== $user->getSalt()) {
241-
return false;
241+
return true;
242242
}
243243

244244
if ($this->user->getUsername() !== $user->getUsername()) {
245-
return false;
245+
return true;
246246
}
247247

248248
if ($this->user instanceof AdvancedUserInterface && $user instanceof AdvancedUserInterface) {
249249
if ($this->user->isAccountNonExpired() !== $user->isAccountNonExpired()) {
250-
return false;
250+
return true;
251251
}
252252

253253
if ($this->user->isAccountNonLocked() !== $user->isAccountNonLocked()) {
254-
return false;
254+
return true;
255255
}
256256

257257
if ($this->user->isCredentialsNonExpired() !== $user->isCredentialsNonExpired()) {
258-
return false;
258+
return true;
259259
}
260260

261261
if ($this->user->isEnabled() !== $user->isEnabled()) {
262-
return false;
262+
return true;
263263
}
264264
} elseif ($this->user instanceof AdvancedUserInterface xor $user instanceof AdvancedUserInterface) {
265-
return false;
265+
return true;
266266
}
267267

268-
return true;
268+
return false;
269269
}
270270
}

0 commit comments

Comments
 (0)