diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When method name is hasUserChanged the return boolean should be true

Browse Source 
(to match question semantics) and false when user has not changed,
this commits inverts return statements.
This commit is contained in:
Dariusz Górecki 2012-01-02 13:04:18 +01:00
parent c57b528cca
commit 9d3a49f065
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
View File

@ -89,7 +89,7 @@ abstract class AbstractToken implements TokenInterface
if (!$user instanceof UserInterface) {
$changed = true;
} else {
$changed = !$this->hasUserChanged($user);
$changed = $this->hasUserChanged($user);
}
} elseif ($user instanceof UserInterface) {
$changed = true;
@ -230,41 +230,41 @@ abstract class AbstractToken implements TokenInterface
}
if ($this->user instanceof EquatableInterface) {
return $this->user->isEqualTo($user);
return !$this->user->isEqualTo($user);
}
if ($this->user->getPassword() !== $user->getPassword()) {
return false;
return true;
}
if ($this->user->getSalt() !== $user->getSalt()) {
return false;
return true;
}
if ($this->user->getUsername() !== $user->getUsername()) {
return false;
return true;
}
if ($this->user instanceof AdvancedUserInterface && $user instanceof AdvancedUserInterface) {
if ($this->user->isAccountNonExpired() !== $user->isAccountNonExpired()) {
return false;
return true;
}
if ($this->user->isAccountNonLocked() !== $user->isAccountNonLocked()) {
return false;
return true;
}
if ($this->user->isCredentialsNonExpired() !== $user->isCredentialsNonExpired()) {
return false;
return true;
}
if ($this->user->isEnabled() !== $user->isEnabled()) {
return false;
return true;
}
} elseif ($this->user instanceof AdvancedUserInterface xor $user instanceof AdvancedUserInterface) {
return false;
return true;
}
return true;
return false;
}
}