Fix createdAt date range filter

- hiddenName has been disabled in order to fix the missing date range
  values when using the material theme
- data format has been changed to 'Y-m-d' in order to comply with the
  browser date input default format
- tests: date() and strtotime have been replaced with DateTime-related
  objects

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

app/Resources/static/themes/material/index.js

@@ -57,9 +57,9 @@ $(document).ready(() => {
   $('.datepicker').pickadate({
     selectMonths: true,
     selectYears: 15,
-    formatSubmit: 'dd/mm/yyyy',
+    formatSubmit: 'yyyy-mm-dd',
-    hiddenName: true,
+    hiddenName: false,
-    format: 'dd/mm/yyyy',
+    format: 'yyyy-mm-dd',
     container: 'body',
   });
 

src/Wallabag/CoreBundle/Entity/Entry.php

@@ -552,7 +552,7 @@ class Entry
      *
      * @return Entry
      */
-    public function setCreatedAt(\DateTime $createdAt)
+    public function setCreatedAt(\DateTimeInterface $createdAt)
     {
         $this->createdAt = $createdAt;
 

src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php

@@ -75,16 +75,16 @@ class EntryFilterType extends AbstractType
             ->add('createdAt', DateRangeFilterType::class, [
                 'left_date_options' => [
                     'attr' => [
-                        'placeholder' => 'dd/mm/yyyy',
+                        'placeholder' => 'yyyy-mm-dd',
                     ],
-                    'format' => 'dd/MM/yyyy',
+                    'format' => 'yyyy-MM-dd',
                     'widget' => 'single_text',
                 ],
                 'right_date_options' => [
                     'attr' => [
-                        'placeholder' => 'dd/mm/yyyy',
+                        'placeholder' => 'yyyy-mm-dd',
                     ],
-                    'format' => 'dd/MM/yyyy',
+                    'format' => 'yyyy-MM-dd',
                     'widget' => 'single_text',
                 ],
                 'label' => 'entry.filters.created_at.label',

tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php

@@ -822,13 +822,25 @@ class EntryControllerTest extends WallabagCoreTestCase
         $this->logInAs('admin');
         $client = $this->getClient();
 
+        $em = $this->getEntityManager();
+
+        $today = new \DateTimeImmutable();
+        $tomorrow = $today->add(new \DateInterval('P1D'));
+        $yesterday = $today->sub(new \DateInterval('P1D'));
+
+        $entry = new Entry($this->getLoggedInUser());
+        $entry->setUrl('http://0.0.0.0/testFilterOnCreationDate');
+        $entry->setCreatedAt($yesterday);
+        $em->persist($entry);
+        $em->flush();
+
         $crawler = $client->request('GET', '/unread/list');
 
         $form = $crawler->filter('button[id=submit-filter]')->form();
 
         $data = [
-            'entry_filter[createdAt][left_date]' => date('d/m/Y'),
+            'entry_filter[createdAt][left_date]' => $today->format('Y-m-d'),
-            'entry_filter[createdAt][right_date]' => date('d/m/Y', strtotime('+1 day')),
+            'entry_filter[createdAt][right_date]' => $tomorrow->format('Y-m-d'),
         ];
 
         $crawler = $client->submit($form, $data);
@@ -836,8 +848,8 @@ class EntryControllerTest extends WallabagCoreTestCase
         $this->assertCount(5, $crawler->filter('li.entry'));
 
         $data = [
-            'entry_filter[createdAt][left_date]' => date('d/m/Y'),
+            'entry_filter[createdAt][left_date]' => $today->format('Y-m-d'),
-            'entry_filter[createdAt][right_date]' => date('d/m/Y'),
+            'entry_filter[createdAt][right_date]' => $today->format('Y-m-d'),
         ];
 
         $crawler = $client->submit($form, $data);
@@ -845,8 +857,8 @@ class EntryControllerTest extends WallabagCoreTestCase
         $this->assertCount(5, $crawler->filter('li.entry'));
 
         $data = [
-            'entry_filter[createdAt][left_date]' => '01/01/1970',
+            'entry_filter[createdAt][left_date]' => '1970-01-01',
-            'entry_filter[createdAt][right_date]' => '01/01/1970',
+            'entry_filter[createdAt][right_date]' => '1970-01-01',
         ];
 
         $crawler = $client->submit($form, $data);