diff options
Diffstat (limited to 'src/Wallabag/UserBundle')
-rw-r--r-- | src/Wallabag/UserBundle/Controller/ResettingController.php | 6 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Entity/User.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Wallabag/UserBundle/Controller/ResettingController.php b/src/Wallabag/UserBundle/Controller/ResettingController.php index 8aa1e230..62e27d00 100644 --- a/src/Wallabag/UserBundle/Controller/ResettingController.php +++ b/src/Wallabag/UserBundle/Controller/ResettingController.php | |||
@@ -2,12 +2,12 @@ | |||
2 | 2 | ||
3 | namespace Wallabag\UserBundle\Controller; | 3 | namespace Wallabag\UserBundle\Controller; |
4 | 4 | ||
5 | use FOS\UserBundle\FOSUserEvents; | 5 | use FOS\UserBundle\Event\FilterUserResponseEvent; |
6 | use FOS\UserBundle\Event\FormEvent; | 6 | use FOS\UserBundle\Event\FormEvent; |
7 | use FOS\UserBundle\Event\GetResponseUserEvent; | 7 | use FOS\UserBundle\Event\GetResponseUserEvent; |
8 | use FOS\UserBundle\Event\FilterUserResponseEvent; | 8 | use FOS\UserBundle\FOSUserEvents; |
9 | use Symfony\Component\HttpFoundation\Request; | ||
10 | use Symfony\Component\HttpFoundation\RedirectResponse; | 9 | use Symfony\Component\HttpFoundation\RedirectResponse; |
10 | use Symfony\Component\HttpFoundation\Request; | ||
11 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; | 11 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
12 | 12 | ||
13 | class ResettingController extends \FOS\UserBundle\Controller\ResettingController | 13 | class ResettingController extends \FOS\UserBundle\Controller\ResettingController |
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php index e6528420..4bbb68dc 100644 --- a/src/Wallabag/UserBundle/Entity/User.php +++ b/src/Wallabag/UserBundle/Entity/User.php | |||
@@ -6,11 +6,11 @@ use Doctrine\Common\Collections\ArrayCollection; | |||
6 | use Doctrine\ORM\Mapping as ORM; | 6 | use Doctrine\ORM\Mapping as ORM; |
7 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; | 7 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; |
8 | use Scheb\TwoFactorBundle\Model\TrustedComputerInterface; | 8 | use Scheb\TwoFactorBundle\Model\TrustedComputerInterface; |
9 | use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; | 9 | use FOS\UserBundle\Model\User as BaseUser; |
10 | use Symfony\Component\Security\Core\User\UserInterface; | ||
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 Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; |
13 | use Symfony\Component\Security\Core\User\UserInterface; | ||
14 | use Wallabag\CoreBundle\Entity\Config; | 14 | use Wallabag\CoreBundle\Entity\Config; |
15 | use Wallabag\CoreBundle\Entity\Entry; | 15 | use Wallabag\CoreBundle\Entity\Entry; |
16 | 16 | ||