diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-04-29 19:22:50 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-29 10:16:23 +0200 |
commit | 2251045901875aa815dee43ec467fb1af8d416d0 (patch) | |
tree | 45d49bfaee4afdc502231ce60f835846a22afeca /src/Wallabag/UserBundle/Entity/User.php | |
parent | b788add08787863ac2a0e68ddaf4620da4b2b33c (diff) | |
download | wallabag-2251045901875aa815dee43ec467fb1af8d416d0.tar.gz wallabag-2251045901875aa815dee43ec467fb1af8d416d0.tar.zst wallabag-2251045901875aa815dee43ec467fb1af8d416d0.zip |
WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'src/Wallabag/UserBundle/Entity/User.php')
-rw-r--r-- | src/Wallabag/UserBundle/Entity/User.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php index 3a167de7..1863c966 100644 --- a/src/Wallabag/UserBundle/Entity/User.php +++ b/src/Wallabag/UserBundle/Entity/User.php | |||
@@ -4,6 +4,7 @@ namespace Wallabag\UserBundle\Entity; | |||
4 | 4 | ||
5 | use Doctrine\Common\Collections\ArrayCollection; | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | use Doctrine\ORM\Mapping as ORM; | 6 | use Doctrine\ORM\Mapping as ORM; |
7 | use JMS\Serializer\Annotation\Groups; | ||
7 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; | 8 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; |
8 | use Scheb\TwoFactorBundle\Model\TrustedComputerInterface; | 9 | use Scheb\TwoFactorBundle\Model\TrustedComputerInterface; |
9 | use FOS\UserBundle\Model\User as BaseUser; | 10 | use FOS\UserBundle\Model\User as BaseUser; |
@@ -35,6 +36,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
35 | * @ORM\Column(name="id", type="integer") | 36 | * @ORM\Column(name="id", type="integer") |
36 | * @ORM\Id | 37 | * @ORM\Id |
37 | * @ORM\GeneratedValue(strategy="AUTO") | 38 | * @ORM\GeneratedValue(strategy="AUTO") |
39 | * @Groups({"user_api"}) | ||
38 | */ | 40 | */ |
39 | protected $id; | 41 | protected $id; |
40 | 42 | ||
@@ -42,6 +44,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
42 | * @var string | 44 | * @var string |
43 | * | 45 | * |
44 | * @ORM\Column(name="name", type="text", nullable=true) | 46 | * @ORM\Column(name="name", type="text", nullable=true) |
47 | * @Groups({"user_api"}) | ||
45 | */ | 48 | */ |
46 | protected $name; | 49 | protected $name; |
47 | 50 | ||
@@ -49,6 +52,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
49 | * @var date | 52 | * @var date |
50 | * | 53 | * |
51 | * @ORM\Column(name="created_at", type="datetime") | 54 | * @ORM\Column(name="created_at", type="datetime") |
55 | * @Groups({"user_api"}) | ||
52 | */ | 56 | */ |
53 | protected $createdAt; | 57 | protected $createdAt; |
54 | 58 | ||
@@ -56,6 +60,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
56 | * @var date | 60 | * @var date |
57 | * | 61 | * |
58 | * @ORM\Column(name="updated_at", type="datetime") | 62 | * @ORM\Column(name="updated_at", type="datetime") |
63 | * @Groups({"user_api"}) | ||
59 | */ | 64 | */ |
60 | protected $updatedAt; | 65 | protected $updatedAt; |
61 | 66 | ||