summaryrefslogtreecommitdiffstats
path: root/Core/User
diff options
context:
space:
mode:
Diffstat (limited to 'Core/User')
-rw-r--r--Core/User/ComparableInterface.php32
-rw-r--r--Core/User/User.php40
-rw-r--r--Core/User/UserInterface.php15
3 files changed, 32 insertions, 55 deletions
diff --git a/Core/User/ComparableInterface.php b/Core/User/ComparableInterface.php
new file mode 100644
index 0000000..2d1fe8f
--- /dev/null
+++ b/Core/User/ComparableInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\User;
+
+/**
+ * ComparatorInterface used to test if two object are equal in security
+ * and re-authentication context.
+ *
+ * @author Dariusz Górecki <darek.krk@gmail.com>
+ */
+interface ComparableInterface
+{
+ /**
+ * The equality comparison should neither be done by referential equality
+ * nor by comparing identities (i.e. getId() === getId()).
+ *
+ * However, you do not need to compare every attribute, but only those that
+ * are relevant for assessing whether re-authentication is required.
+ *
+ * @return boolean
+ */
+ public function compareTo($object);
+}
diff --git a/Core/User/User.php b/Core/User/User.php
index d586511..6076603 100644
--- a/Core/User/User.php
+++ b/Core/User/User.php
@@ -112,44 +112,4 @@ final class User implements AdvancedUserInterface
public function eraseCredentials()
{
}
-
- /**
- * {@inheritDoc}
- */
- public function equals(UserInterface $user)
- {
- if (!$user instanceof User) {
- return false;
- }
-
- if ($this->password !== $user->getPassword()) {
- return false;
- }
-
- if ($this->getSalt() !== $user->getSalt()) {
- return false;
- }
-
- if ($this->username !== $user->getUsername()) {
- return false;
- }
-
- if ($this->accountNonExpired !== $user->isAccountNonExpired()) {
- return false;
- }
-
- if ($this->accountNonLocked !== $user->isAccountNonLocked()) {
- return false;
- }
-
- if ($this->credentialsNonExpired !== $user->isCredentialsNonExpired()) {
- return false;
- }
-
- if ($this->enabled !== $user->isEnabled()) {
- return false;
- }
-
- return true;
- }
}
diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php
index 85356b7..ce3b3a8 100644
--- a/Core/User/UserInterface.php
+++ b/Core/User/UserInterface.php
@@ -84,19 +84,4 @@ interface UserInterface
* @return void
*/
function eraseCredentials();
-
- /**
- * Returns whether or not the given user is equivalent to *this* user.
- *
- * The equality comparison should neither be done by referential equality
- * nor by comparing identities (i.e. getId() === getId()).
- *
- * However, you do not need to compare every attribute, but only those that
- * are relevant for assessing whether re-authentication is required.
- *
- * @param UserInterface $user
- *
- * @return Boolean
- */
- function equals(UserInterface $user);
}