diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity/User.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/User.php | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index a6002352..ae2902a3 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php | |||
@@ -6,7 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection; | |||
6 | use Doctrine\ORM\Mapping as ORM; | 6 | use Doctrine\ORM\Mapping as ORM; |
7 | use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; | 7 | use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; |
8 | use Symfony\Component\Security\Core\User\UserInterface; | 8 | use Symfony\Component\Security\Core\User\UserInterface; |
9 | use Symfony\Component\Security\Core\User\AdvancedUserInterface; | ||
10 | use JMS\Serializer\Annotation\ExclusionPolicy; | 9 | use JMS\Serializer\Annotation\ExclusionPolicy; |
11 | use JMS\Serializer\Annotation\Expose; | 10 | use JMS\Serializer\Annotation\Expose; |
12 | use FOS\UserBundle\Model\User as BaseUser; | 11 | use FOS\UserBundle\Model\User as BaseUser; |
@@ -22,7 +21,7 @@ use FOS\UserBundle\Model\User as BaseUser; | |||
22 | * @UniqueEntity("email") | 21 | * @UniqueEntity("email") |
23 | * @UniqueEntity("username") | 22 | * @UniqueEntity("username") |
24 | */ | 23 | */ |
25 | class User extends BaseUser implements AdvancedUserInterface, \Serializable | 24 | class User extends BaseUser |
26 | { | 25 | { |
27 | /** | 26 | /** |
28 | * @var int | 27 | * @var int |
@@ -75,6 +74,7 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable | |||
75 | parent::__construct(); | 74 | parent::__construct(); |
76 | $this->entries = new ArrayCollection(); | 75 | $this->entries = new ArrayCollection(); |
77 | $this->tags = new ArrayCollection(); | 76 | $this->tags = new ArrayCollection(); |
77 | $this->roles = array('ROLE_USER'); | ||
78 | } | 78 | } |
79 | 79 | ||
80 | /** | 80 | /** |
@@ -91,24 +91,6 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable | |||
91 | } | 91 | } |
92 | 92 | ||
93 | /** | 93 | /** |
94 | * Set password. | ||
95 | * | ||
96 | * @param string $password | ||
97 | * | ||
98 | * @return User | ||
99 | */ | ||
100 | public function setPassword($password) | ||
101 | { | ||
102 | if (!$password && 0 === strlen($password)) { | ||
103 | return; | ||
104 | } | ||
105 | |||
106 | $this->password = sha1($password.$this->getUsername().$this->getSalt()); | ||
107 | |||
108 | return $this; | ||
109 | } | ||
110 | |||
111 | /** | ||
112 | * Set name. | 94 | * Set name. |
113 | * | 95 | * |
114 | * @param string $name | 96 | * @param string $name |