1 files changed, 38 insertions, 0 deletions

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
new file mode 100644
index 00000000..cfdbfe97
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Subscriber;
+
+use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
+use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * This custom class override the default behavior of LexikFilterBundle on `filter_date_range`
+ * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59).
+ */
+class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
+{
+    /**
+     * @param GetFilterConditionEvent $event
+     */
+    public function filterDateRange(GetFilterConditionEvent $event)
+    {
+        $expr = $event->getFilterQuery()->getExpressionBuilder();
+        $values = $event->getValues();
+        $value = $values['value'];
+
+        // left date should start at midnight
+        if (isset($value['left_date'][0]) && $value['left_date'][0] instanceof \DateTime) {
+            $value['left_date'][0]->setTime(0, 0, 0);
+        }
+
+        // right adte should end one second before midnight
+        if (isset($value['right_date'][0]) && $value['right_date'][0] instanceof \DateTime) {
+            $value['right_date'][0]->setTime(23, 59, 59);
+        }
+
+        if (isset($value['left_date'][0]) || isset($value['right_date'][0])) {
+            $event->setCondition($expr->dateTimeInRange($event->getField(), $value['left_date'][0], $value['right_date'][0]));
+        }
+    }
+}