diff options
| -rw-r--r-- | Core/Authentication/Token/AbstractToken.php | 10 | ||||
| -rw-r--r-- | Core/User/EquatableInterface.php (renamed from Core/User/ComparableInterface.php) | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php index 4b48bab..7dcdf42 100644 --- a/Core/Authentication/Token/AbstractToken.php +++ b/Core/Authentication/Token/AbstractToken.php @@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\Role\RoleInterface; use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\AdvancedUserInterface; -use Symfony\Component\Security\Core\User\ComparableInterface; +use Symfony\Component\Security\Core\User\EquatableInterface; /** * Base class for Token instances. @@ -89,7 +89,7 @@ abstract class AbstractToken implements TokenInterface if (!$user instanceof UserInterface) { $changed = true; } else { - $changed = !$this->compareUser($user); + $changed = !$this->isUserChanged($user); } } elseif ($user instanceof UserInterface) { $changed = true; @@ -223,14 +223,14 @@ abstract class AbstractToken implements TokenInterface return sprintf('%s(user="%s", authenticated=%s, roles="%s")', $class, $this->getUsername(), json_encode($this->authenticated), implode(', ', $roles)); } - private function compareUser(UserInterface $user) + private function isUserChanged(UserInterface $user) { if (!($this->user instanceof UserInterface)) { throw new \BadMethodCallException('Method "compareUser" should be called when current user class is instance of "UserInterface".'); } - if ($this->user instanceof ComparableInterface) { - return $this->user->compareTo($user); + if ($this->user instanceof EquatableInterface) { + return $this->user->isEqualTo($user); } if ($this->user->getPassword() !== $user->getPassword()) { diff --git a/Core/User/ComparableInterface.php b/Core/User/EquatableInterface.php index 0dde4f1..e67ebfa 100644 --- a/Core/User/ComparableInterface.php +++ b/Core/User/EquatableInterface.php @@ -12,12 +12,12 @@ namespace Symfony\Component\Security\Core\User; /** - * ComparableInterface used to test if two objects are equal in security + * EquatableInterface used to test if two objects are equal in security * and re-authentication context. * * @author Dariusz Górecki <darek.krk@gmail.com> */ -interface ComparableInterface +interface EquatableInterface { /** * The equality comparison should neither be done by referential equality @@ -30,5 +30,5 @@ interface ComparableInterface * * @return Boolean */ - function compareTo(UserInterface $user); + function isEqualTo(UserInterface $user); } |