diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-20 08:22:39 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-20 08:22:39 +0200 |
commit | 4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1 (patch) | |
tree | 4d878e6d4eb5c1baab95cd02e3eb95ee4182a399 /src/Wallabag/CoreBundle/Entity | |
parent | 34437f408c5b7b590aded6795d7ce01bfbfc7711 (diff) | |
parent | 8ce32af61229eec8f4cc34b207273d47f60adc48 (diff) | |
download | wallabag-4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1.tar.gz wallabag-4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1.tar.zst wallabag-4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1.zip |
Merge pull request #1383 from wallabag/cs
CS
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Tag.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/User.php | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php index 92442df6..6f005314 100644 --- a/src/Wallabag/CoreBundle/Entity/Tag.php +++ b/src/Wallabag/CoreBundle/Entity/Tag.php | |||
@@ -48,7 +48,7 @@ class Tag | |||
48 | 48 | ||
49 | public function __construct(User $user) | 49 | public function __construct(User $user) |
50 | { | 50 | { |
51 | $this->user = $user; | 51 | $this->user = $user; |
52 | $this->entries = new ArrayCollection(); | 52 | $this->entries = new ArrayCollection(); |
53 | } | 53 | } |
54 | 54 | ||
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index 00eb808a..510a1594 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php | |||
@@ -123,9 +123,9 @@ class User implements AdvancedUserInterface, \Serializable | |||
123 | public function __construct() | 123 | public function __construct() |
124 | { | 124 | { |
125 | $this->isActive = true; | 125 | $this->isActive = true; |
126 | $this->salt = md5(uniqid(null, true)); | 126 | $this->salt = md5(uniqid(null, true)); |
127 | $this->entries = new ArrayCollection(); | 127 | $this->entries = new ArrayCollection(); |
128 | $this->tags = new ArrayCollection(); | 128 | $this->tags = new ArrayCollection(); |
129 | } | 129 | } |
130 | 130 | ||
131 | /** | 131 | /** |
@@ -176,7 +176,7 @@ class User implements AdvancedUserInterface, \Serializable | |||
176 | } | 176 | } |
177 | 177 | ||
178 | /** | 178 | /** |
179 | * @inheritDoc | 179 | * {@inheritdoc} |
180 | */ | 180 | */ |
181 | public function getSalt() | 181 | public function getSalt() |
182 | { | 182 | { |
@@ -184,7 +184,7 @@ class User implements AdvancedUserInterface, \Serializable | |||
184 | } | 184 | } |
185 | 185 | ||
186 | /** | 186 | /** |
187 | * @inheritDoc | 187 | * {@inheritdoc} |
188 | */ | 188 | */ |
189 | public function getRoles() | 189 | public function getRoles() |
190 | { | 190 | { |
@@ -323,7 +323,7 @@ class User implements AdvancedUserInterface, \Serializable | |||
323 | return $this->tags; | 323 | return $this->tags; |
324 | } | 324 | } |
325 | /** | 325 | /** |
326 | * @inheritDoc | 326 | * {@inheritdoc} |
327 | */ | 327 | */ |
328 | public function eraseCredentials() | 328 | public function eraseCredentials() |
329 | { | 329 | { |