diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-09-23 09:13:34 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-09-23 09:13:34 +0200 |
commit | 57162494557c5eac938a7d6800ac1b112f73efc9 (patch) | |
tree | 0e0638166e8b734e17b9eb9a4c86d9008ed7be3d /src/Wallabag/CoreBundle/Entity/User.php | |
parent | 1db9d411c5b1fe592788866dc206e2fd6dc87a71 (diff) | |
parent | d4ebe5c5dcf581416ab76136908cafbde78f63bf (diff) | |
download | wallabag-57162494557c5eac938a7d6800ac1b112f73efc9.tar.gz wallabag-57162494557c5eac938a7d6800ac1b112f73efc9.tar.zst wallabag-57162494557c5eac938a7d6800ac1b112f73efc9.zip |
Merge pull request #1429 from wallabag/v2-language
V2 – Handle language in entry
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity/User.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/User.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index eeae331e..a6002352 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php | |||
@@ -7,7 +7,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; | 9 | use Symfony\Component\Security\Core\User\AdvancedUserInterface; |
10 | use Symfony\Component\Validator\Constraints as Assert; | ||
11 | use JMS\Serializer\Annotation\ExclusionPolicy; | 10 | use JMS\Serializer\Annotation\ExclusionPolicy; |
12 | use JMS\Serializer\Annotation\Expose; | 11 | use JMS\Serializer\Annotation\Expose; |
13 | use FOS\UserBundle\Model\User as BaseUser; | 12 | use FOS\UserBundle\Model\User as BaseUser; |
@@ -74,8 +73,8 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable | |||
74 | public function __construct() | 73 | public function __construct() |
75 | { | 74 | { |
76 | parent::__construct(); | 75 | parent::__construct(); |
77 | $this->entries = new ArrayCollection(); | 76 | $this->entries = new ArrayCollection(); |
78 | $this->tags = new ArrayCollection(); | 77 | $this->tags = new ArrayCollection(); |
79 | } | 78 | } |
80 | 79 | ||
81 | /** | 80 | /** |