Update bundle & stock file

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Filter / EntryFilterType.php

diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
index c0b8919682dba71f9f1f4d4a5c4fb0130606176b..4430c971a67e4046ccff0fe0fd72fb89e2efbb12 100644 (file)
--- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
@@ -2,18 +2,40 @@
 
 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;
-use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
+use Wallabag\UserBundle\Entity\User;
 
 class EntryFilterType extends AbstractType
 {
+    private $user;
+    private $repository;
+
+    /**
+     * Repository & user are used to get a list of language entries for this user.
+     *
+     * @param EntityRepository $entryRepository
+     * @param User             $user
+     */
+    public function __construct(EntityRepository $entryRepository, User $user)
+    {
+        $this->repository = $entryRepository;
+        $this->user = $user;
+    }
+
     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',
@@ -30,10 +52,10 @@ 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) <= 3 || empty($value)) {
+                        if (strlen($value) <= 2 || empty($value)) {
                             return;
                         }
                         $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
@@ -41,18 +63,27 @@ 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;
+                    }
+
                     $expression = $filterQuery->getExpr()->isNotNull($field);
 
                     return $filterQuery->createCondition($expression);
                 },
-            ));
+            ))
+            ->add('language', ChoiceFilterType::class, array(
+                'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
+                'choices_as_values' => true,
+            ))
+        ;
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'entry_filter';
     }