summaryrefslogtreecommitdiffstats
path: root/Core/Authentication/Token
diff options
context:
space:
mode:
authorDariusz Górecki <darek.krk@gmail.com>2011-12-20 20:11:43 +0100
committerDariusz Górecki <darek.krk@gmail.com>2012-01-10 21:55:04 +0100
commitf8e84db6faa5154d77b31cb3224024668793d1f4 (patch)
treea685c57d5468371c59da86ca146aa07b74582081 /Core/Authentication/Token
parent5aa62b93500b226e081fad4b9e08890b78e3abd5 (diff)
downloadsymfony-security-f8e84db6faa5154d77b31cb3224024668793d1f4.zip
symfony-security-f8e84db6faa5154d77b31cb3224024668793d1f4.tar.gz
symfony-security-f8e84db6faa5154d77b31cb3224024668793d1f4.tar.bz2
Change names to Equatable
Diffstat (limited to 'Core/Authentication/Token')
-rw-r--r--Core/Authentication/Token/AbstractToken.php10
1 files changed, 5 insertions, 5 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()) {