diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-07 11:13:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-07 11:13:50 +0100 |
commit | a4de2351a0fbae735cad234ca8a50bdee7632b68 (patch) | |
tree | 9a5092609c015de6a55470f4ea447aab3bb29d31 /src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |
parent | 06283bef72a0fcc6004dc69e014146486ba210bc (diff) | |
parent | 94766a89627df74449b9e34d31a06db386a1b07a (diff) | |
download | wallabag-a4de2351a0fbae735cad234ca8a50bdee7632b68.tar.gz wallabag-a4de2351a0fbae735cad234ca8a50bdee7632b68.tar.zst wallabag-a4de2351a0fbae735cad234ca8a50bdee7632b68.zip |
Merge pull request #2556 from wallabag/replace-tokenstorage
Replaced TokenStorage with TokenStorageInterface
Diffstat (limited to 'src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index 3c597b5d..a3e36fdd 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -12,7 +12,7 @@ use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType; | |||
12 | use Symfony\Component\Form\AbstractType; | 12 | use Symfony\Component\Form\AbstractType; |
13 | use Symfony\Component\Form\FormBuilderInterface; | 13 | use Symfony\Component\Form\FormBuilderInterface; |
14 | use Symfony\Component\OptionsResolver\OptionsResolver; | 14 | use Symfony\Component\OptionsResolver\OptionsResolver; |
15 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; | 15 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
16 | 16 | ||
17 | class EntryFilterType extends AbstractType | 17 | class EntryFilterType extends AbstractType |
18 | { | 18 | { |
@@ -22,13 +22,18 @@ class EntryFilterType extends AbstractType | |||
22 | /** | 22 | /** |
23 | * Repository & user are used to get a list of language entries for this user. | 23 | * Repository & user are used to get a list of language entries for this user. |
24 | * | 24 | * |
25 | * @param EntityRepository $entryRepository | 25 | * @param EntityRepository $entryRepository |
26 | * @param TokenStorage $token | 26 | * @param TokenStorageInterface $tokenStorage |
27 | */ | 27 | */ |
28 | public function __construct(EntityRepository $entryRepository, TokenStorage $token) | 28 | public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage) |
29 | { | 29 | { |
30 | $this->repository = $entryRepository; | 30 | $this->repository = $entryRepository; |
31 | $this->user = $token->getToken()->getUser(); | 31 | |
32 | $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null; | ||
33 | |||
34 | if (null === $this->user || !is_object($this->user)) { | ||
35 | return null; | ||
36 | } | ||
32 | } | 37 | } |
33 | 38 | ||
34 | public function buildForm(FormBuilderInterface $builder, array $options) | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |