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

Change names to Equatable

Browse Source
This commit is contained in:
Dariusz Górecki 2011-12-20 20:11:43 +01:00
parent 680b1086e9
commit 56db4a1d26
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\Role\RoleInterface;
use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\User\AdvancedUserInterface; 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. * Base class for Token instances.
@ -89,7 +89,7 @@ abstract class AbstractToken implements TokenInterface
if (!$user instanceof UserInterface) { if (!$user instanceof UserInterface) {
$changed = true; $changed = true;
} else { } else {
$changed = !$this->compareUser($user); $changed = !$this->isUserChanged($user);
} }
} elseif ($user instanceof UserInterface) { } elseif ($user instanceof UserInterface) {
$changed = true; $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)); 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)) { if (!($this->user instanceof UserInterface)) {
throw new \BadMethodCallException('Method "compareUser" should be called when current user class is instance of "UserInterface".'); throw new \BadMethodCallException('Method "compareUser" should be called when current user class is instance of "UserInterface".');
} }
if ($this->user instanceof ComparableInterface) { if ($this->user instanceof EquatableInterface) {
return $this->user->compareTo($user); return $this->user->isEqualTo($user);
} }
if ($this->user->getPassword() !== $user->getPassword()) { if ($this->user->getPassword() !== $user->getPassword()) {

6
src/Symfony/Component/Security/Core/User/ComparableInterface.php → src/Symfony/Component/Security/Core/User/EquatableInterface.php
View File

@ -12,12 +12,12 @@
namespace Symfony\Component\Security\Core\User; 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. * and re-authentication context.
* *
* @author Dariusz Górecki <darek.krk@gmail.com> * @author Dariusz Górecki <darek.krk@gmail.com>
*/ */
interface ComparableInterface interface EquatableInterface
{ {
/** /**
* The equality comparison should neither be done by referential equality * The equality comparison should neither be done by referential equality
@ -30,5 +30,5 @@ interface ComparableInterface
* *
* @return Boolean * @return Boolean
*/ */
function compareTo(UserInterface $user); function isEqualTo(UserInterface $user);
} }