Fix createdAt date range filter

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

diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index 6f8c9e27137c953a4170943cd6b7c43a5a0b6166..61ad99a8656c0b28f9a8fea472c05226d63fb36c 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -23,9 +23,6 @@ class EntryFilterType extends AbstractType
 
     /**
      * Repository & user are used to get a list of language entries for this user.
-     *
-     * @param EntityRepository      $entryRepository
-     * @param TokenStorageInterface $tokenStorage
      */
     public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
     {
@@ -33,7 +30,7 @@ class EntryFilterType extends AbstractType
 
         $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null;
 
-        if (null === $this->user || !is_object($this->user)) {
+        if (null === $this->user || !\is_object($this->user)) {
             return;
         }
     }
@@ -54,8 +51,8 @@ class EntryFilterType extends AbstractType
                     $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());
+                    $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed() / 200);
+                    $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed() / 200);
 
                     if (null === $lower && null === $upper) {
                         // no value? no filter
@@ -76,27 +73,26 @@ class EntryFilterType extends AbstractType
                 'label' => 'entry.filters.reading_time.label',
             ])
             ->add('createdAt', DateRangeFilterType::class, [
-                    'left_date_options' => [
-                        'attr' => [
-                            'placeholder' => 'dd/mm/yyyy',
-                        ],
-                        'format' => 'dd/MM/yyyy',
-                        'widget' => 'single_text',
+                'left_date_options' => [
+                    'attr' => [
+                        'placeholder' => 'yyyy-mm-dd',
                     ],
-                    'right_date_options' => [
-                        'attr' => [
-                            'placeholder' => 'dd/mm/yyyy',
-                        ],
-                        'format' => 'dd/MM/yyyy',
-                        'widget' => 'single_text',
+                    'format' => 'yyyy-MM-dd',
+                    'widget' => 'single_text',
+                ],
+                'right_date_options' => [
+                    'attr' => [
+                        'placeholder' => 'yyyy-mm-dd',
                     ],
-                    'label' => 'entry.filters.created_at.label',
-                ]
-            )
+                    'format' => 'yyyy-MM-dd',
+                    'widget' => 'single_text',
+                ],
+                'label' => 'entry.filters.created_at.label',
+            ])
             ->add('domainName', TextFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     $value = $values['value'];
-                    if (strlen($value) <= 2 || empty($value)) {
+                    if (\strlen($value) <= 2 || empty($value)) {
                         return;
                     }
                     $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->lower($filterQuery->getExpr()->literal('%' . $value . '%')));
@@ -108,7 +104,7 @@ class EntryFilterType extends AbstractType
             ->add('httpStatus', TextFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     $value = $values['value'];
-                    if (false === array_key_exists($value, Response::$statusTexts)) {
+                    if (false === \array_key_exists($value, Response::$statusTexts)) {
                         return;
                     }