3 files changed, 32 insertions, 12 deletions

diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
index b712ad15..cb4bee83 100644
--- a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
+++ b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
@@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface
     private $separator;
 
     /**
-     * @param string $separator The separator used in the list.
+     * @param string $separator The separator used in the list
      */
     public function __construct($separator = ',')
     {
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 4cf22200..7d25cc80 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -21,7 +21,9 @@ class ConfigType extends AbstractType
     {
         $this->themes = array_combine(
             $themes,
-            array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
+            array_map(function ($s) {
+                return ucwords(strtolower(str_replace('-', ' ', $s)));
+            }, $themes)
         );
 
         $this->languages = $languages;
@@ -32,7 +34,6 @@ class ConfigType extends AbstractType
         $builder
             ->add('theme', ChoiceType::class, [
                 'choices' => array_flip($this->themes),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.theme_label',
             ])
             ->add('items_per_page', null, [
@@ -49,7 +50,6 @@ class ConfigType extends AbstractType
             ])
             ->add('language', ChoiceType::class, [
                 'choices' => array_flip($this->languages),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.language_label',
             ])
             ->add('save', SubmitType::class, [
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index cd4d3490..3c597b5d 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -36,17 +36,26 @@ class EntryFilterType extends AbstractType
         $builder
             ->add('readingTime', NumberRangeFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
-                    $value = $values['value'];
+                    $lower = $values['value']['left_number'][0];
+                    $upper = $values['value']['right_number'][0];
+
+                    $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed());
+                    $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed());
 
-                    if (null === $value['left_number'][0] || null === $value['right_number'][0]) {
+                    if (null === $lower && null === $upper) {
+                        // no value? no filter
                         return;
+                    } elseif (null === $lower && null !== $upper) {
+                        // only lower value is defined: query all entries with reading LOWER THAN this value
+                        $expression = $filterQuery->getExpr()->lte($field, $max);
+                    } elseif (null !== $lower && null === $upper) {
+                        // only upper value is defined: query all entries with reading GREATER THAN this value
+                        $expression = $filterQuery->getExpr()->gte($field, $min);
+                    } else {
+                        // both value are defined, perform a between
+                        $expression = $filterQuery->getExpr()->between($field, $min, $max);
                     }
 
-                    $min = (int) ($value['left_number'][0] * $this->user->getConfig()->getReadingSpeed());
-                    $max = (int) ($value['right_number'][0] * $this->user->getConfig()->getReadingSpeed());
-
-                    $expression = $filterQuery->getExpr()->between($field, $min, $max);
-
                     return $filterQuery->createCondition($expression);
                 },
                 'label' => 'entry.filters.reading_time.label',
@@ -87,6 +96,18 @@ class EntryFilterType extends AbstractType
             ->add('isStarred', CheckboxFilterType::class, [
                 'label' => 'entry.filters.starred_label',
             ])
+            ->add('isUnread', CheckboxFilterType::class, [
+                'label' => 'entry.filters.unread_label',
+                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
+                    if (false === $values['value']) {
+                        return;
+                    }
+
+                    $expression = $filterQuery->getExpr()->eq('e.isArchived', 'false');
+
+                    return $filterQuery->createCondition($expression);
+                },
+            ])
             ->add('previewPicture', CheckboxFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     if (false === $values['value']) {
@@ -101,7 +122,6 @@ class EntryFilterType extends AbstractType
             ])
             ->add('language', ChoiceFilterType::class, [
                 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
-                'choices_as_values' => true,
                 'label' => 'entry.filters.language_label',
             ])
         ;