From 619cc45359ead519b64129181a07e14160fbbfcb Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Dec 2015 10:16:34 +0100 Subject: Symfony Upgrade Fixer FTW symfony-upgrade-fixer fix src/Wallabag/ --- src/Wallabag/CoreBundle/Filter/EntryFilterType.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Filter') diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index 32de21ca..e0a1cb31 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -2,11 +2,11 @@ namespace Wallabag\CoreBundle\Filter; +use Doctrine\ORM\EntityRepository; +use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; -use Doctrine\ORM\EntityRepository; use Wallabag\UserBundle\Entity\User; class EntryFilterType extends AbstractType @@ -77,7 +77,7 @@ class EntryFilterType extends AbstractType ; } - public function getName() + public function getBlockPrefix() { return 'entry_filter'; } -- cgit v1.2.3 From 5c895a7fd15822856fb407910264c5d95e1e223c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Dec 2015 13:00:37 +0100 Subject: Update bundle & stock file - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler --- src/Wallabag/CoreBundle/Filter/EntryFilterType.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/Wallabag/CoreBundle/Filter') diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index e0a1cb31..4430c971 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -4,6 +4,11 @@ namespace Wallabag\CoreBundle\Filter; use Doctrine\ORM\EntityRepository; use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -29,8 +34,8 @@ class EntryFilterType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('readingTime', 'filter_number_range') - ->add('createdAt', 'filter_date_range', array( + ->add('readingTime', NumberRangeFilterType::class) + ->add('createdAt', DateRangeFilterType::class, array( 'left_date_options' => array( 'attr' => array( 'placeholder' => 'dd/mm/yyyy', @@ -47,7 +52,7 @@ class EntryFilterType extends AbstractType ), ) ) - ->add('domainName', 'filter_text', array( + ->add('domainName', TextFilterType::class, array( 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { $value = $values['value']; if (strlen($value) <= 2 || empty($value)) { @@ -58,9 +63,9 @@ class EntryFilterType extends AbstractType return $filterQuery->createCondition($expression); }, )) - ->add('isArchived', 'filter_checkbox') - ->add('isStarred', 'filter_checkbox') - ->add('previewPicture', 'filter_checkbox', array( + ->add('isArchived', CheckboxFilterType::class) + ->add('isStarred', CheckboxFilterType::class) + ->add('previewPicture', CheckboxFilterType::class, array( 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { if (false === $values['value']) { return; @@ -71,8 +76,9 @@ class EntryFilterType extends AbstractType return $filterQuery->createCondition($expression); }, )) - ->add('language', 'filter_choice', array( - 'choices' => $this->repository->findDistinctLanguageByUser($this->user->getId()), + ->add('language', ChoiceFilterType::class, array( + 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())), + 'choices_as_values' => true, )) ; } -- cgit v1.2.3 From 1d76102a240c2596832848128a7b9cf5aa2050dd Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 9 Jan 2016 18:38:40 +0100 Subject: Fix recent update - some missing url parameters from WallabagRestController & EntryController - use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature) - update ImportBundle (url & form) --- src/Wallabag/CoreBundle/Filter/EntryFilterType.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/Wallabag/CoreBundle/Filter') diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index 4430c971..c38be832 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -12,7 +12,7 @@ use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Wallabag\UserBundle\Entity\User; +use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; class EntryFilterType extends AbstractType { @@ -23,12 +23,12 @@ class EntryFilterType extends AbstractType * Repository & user are used to get a list of language entries for this user. * * @param EntityRepository $entryRepository - * @param User $user + * @param TokenStorage $token */ - public function __construct(EntityRepository $entryRepository, User $user) + public function __construct(EntityRepository $entryRepository, TokenStorage $token) { $this->repository = $entryRepository; - $this->user = $user; + $this->user = $token->getToken()->getUser(); } public function buildForm(FormBuilderInterface $builder, array $options) @@ -54,13 +54,13 @@ class EntryFilterType extends AbstractType ) ->add('domainName', TextFilterType::class, array( 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { - $value = $values['value']; - if (strlen($value) <= 2 || empty($value)) { - return; - } - $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%')); + $value = $values['value']; + if (strlen($value) <= 2 || empty($value)) { + return; + } + $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%')); - return $filterQuery->createCondition($expression); + return $filterQuery->createCondition($expression); }, )) ->add('isArchived', CheckboxFilterType::class) -- cgit v1.2.3