diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-01 10:29:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-01 10:29:32 +0200 |
commit | 5d03e2d1a58d7961aeb3b93dbd864731719af921 (patch) | |
tree | 702aa580c60c788ee51ace0ed79409491854c825 /src/Wallabag/UserBundle | |
parent | 2a0eec07a5630401a9ceb7add65604f79238f10c (diff) | |
parent | 3a6af6c580b686593045a8f0cfbfc478aa93943c (diff) | |
download | wallabag-5d03e2d1a58d7961aeb3b93dbd864731719af921.tar.gz wallabag-5d03e2d1a58d7961aeb3b93dbd864731719af921.tar.zst wallabag-5d03e2d1a58d7961aeb3b93dbd864731719af921.zip |
Merge pull request #3172 from wallabag/more-scruti
More Scrutinizer issues fixed
Diffstat (limited to 'src/Wallabag/UserBundle')
-rw-r--r-- | src/Wallabag/UserBundle/Entity/User.php | 8 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/EventListener/CreateConfigListener.php | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php index 1ff3046a..ed6ce331 100644 --- a/src/Wallabag/UserBundle/Entity/User.php +++ b/src/Wallabag/UserBundle/Entity/User.php | |||
@@ -64,7 +64,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
64 | protected $email; | 64 | protected $email; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * @var date | 67 | * @var \DateTime |
68 | * | 68 | * |
69 | * @ORM\Column(name="created_at", type="datetime") | 69 | * @ORM\Column(name="created_at", type="datetime") |
70 | * | 70 | * |
@@ -73,7 +73,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
73 | protected $createdAt; | 73 | protected $createdAt; |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * @var date | 76 | * @var \DateTime |
77 | * | 77 | * |
78 | * @ORM\Column(name="updated_at", type="datetime") | 78 | * @ORM\Column(name="updated_at", type="datetime") |
79 | * | 79 | * |
@@ -157,7 +157,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
157 | } | 157 | } |
158 | 158 | ||
159 | /** | 159 | /** |
160 | * @return string | 160 | * @return \DateTime |
161 | */ | 161 | */ |
162 | public function getCreatedAt() | 162 | public function getCreatedAt() |
163 | { | 163 | { |
@@ -165,7 +165,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
165 | } | 165 | } |
166 | 166 | ||
167 | /** | 167 | /** |
168 | * @return string | 168 | * @return \DateTime |
169 | */ | 169 | */ |
170 | public function getUpdatedAt() | 170 | public function getUpdatedAt() |
171 | { | 171 | { |
diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php index 0bdd1cae..e4d55c19 100644 --- a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php +++ b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php | |||
@@ -5,7 +5,6 @@ namespace Wallabag\UserBundle\EventListener; | |||
5 | use Doctrine\ORM\EntityManager; | 5 | use Doctrine\ORM\EntityManager; |
6 | use FOS\UserBundle\Event\UserEvent; | 6 | use FOS\UserBundle\Event\UserEvent; |
7 | use FOS\UserBundle\FOSUserEvents; | 7 | use FOS\UserBundle\FOSUserEvents; |
8 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; | ||
9 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; | 8 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
10 | use Wallabag\CoreBundle\Entity\Config; | 9 | use Wallabag\CoreBundle\Entity\Config; |
11 | 10 | ||
@@ -47,7 +46,7 @@ class CreateConfigListener implements EventSubscriberInterface | |||
47 | ]; | 46 | ]; |
48 | } | 47 | } |
49 | 48 | ||
50 | public function createConfig(UserEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null) | 49 | public function createConfig(UserEvent $event) |
51 | { | 50 | { |
52 | $config = new Config($event->getUser()); | 51 | $config = new Config($event->getUser()); |
53 | $config->setTheme($this->theme); | 52 | $config->setTheme($this->theme); |