Fix: invalid date in DateFilter/DateRangeFilter throws exception in A… (#1262)

* Fix: invalid date in DateFilter/DateRangeFilter throws exception in ArrayDataSource and ElasticsearchDataSource

Closes #641

* Tests: add ArrayDataSource tests for invalid date filter values

Author: radimvaculik

src/DataSource/ArrayDataSource.php

@@ -236,8 +236,12 @@ protected function applyFilterDateRange(mixed $row, FilterDateRange $filter): bo
 		$row_value = $row[$filter->getColumn()];
 
 		if ($values['from'] !== null && $values['from'] !== '') {
-			$date_from = DateTimeHelper::tryConvertToDate($values['from'], [$format]);
-			$date_from->setTime(0, 0, 0);
+			try {
+				$date_from = DateTimeHelper::tryConvertToDate($values['from'], [$format]);
+				$date_from->setTime(0, 0, 0);
+			} catch (DatagridDateTimeHelperException) {
+				return false;
+			}
 
 			if (!($row_value instanceof DateTime)) {
 				/**
@@ -259,8 +263,12 @@ protected function applyFilterDateRange(mixed $row, FilterDateRange $filter): bo
 		}
 
 		if ($values['to'] !== null && $values['to'] !== '') {
-			$date_to = DateTimeHelper::tryConvertToDate($values['to'], [$format]);
-			$date_to->setTime(23, 59, 59);
+			try {
+				$date_to = DateTimeHelper::tryConvertToDate($values['to'], [$format]);
+				$date_to->setTime(23, 59, 59);
+			} catch (DatagridDateTimeHelperException) {
+				return false;
+			}
 
 			if (!($row_value instanceof DateTime)) {
 				/**
@@ -295,7 +303,11 @@ protected function applyFilterDate(mixed $row, FilterDate $filter): bool
 		foreach ($condition as $column => $value) {
 			$row_value = $row[$column];
 
-			$date = DateTimeHelper::tryConvertToDateTime($value, [$format]);
+			try {
+				$date = DateTimeHelper::tryConvertToDateTime($value, [$format]);
+			} catch (DatagridDateTimeHelperException) {
+				return false;
+			}
 
 			if (!($row_value instanceof DateTime)) {
 				/**

src/DataSource/ElasticsearchDataSource.php

@@ -2,6 +2,7 @@
 
 namespace Contributte\Datagrid\DataSource;
 
+use Contributte\Datagrid\Exception\DatagridDateTimeHelperException;
 use Contributte\Datagrid\Filter\FilterDate;
 use Contributte\Datagrid\Filter\FilterDateRange;
 use Contributte\Datagrid\Filter\FilterMultiSelect;
@@ -90,17 +91,21 @@ public function applyFilterDate(FilterDate $filter): void
 			$timestampTo = null;
 
 			if ($value) {
-				$dateFrom = DateTimeHelper::tryConvertToDateTime($value, [$filter->getPhpFormat()]);
-				$dateFrom->setTime(0, 0, 0);
+				try {
+					$dateFrom = DateTimeHelper::tryConvertToDateTime($value, [$filter->getPhpFormat()]);
+					$dateFrom->setTime(0, 0, 0);
 
-				$timestampFrom = $dateFrom->getTimestamp();
+					$timestampFrom = $dateFrom->getTimestamp();
 
-				$dateTo = DateTimeHelper::tryConvertToDateTime($value, [$filter->getPhpFormat()]);
-				$dateTo->setTime(23, 59, 59);
+					$dateTo = DateTimeHelper::tryConvertToDateTime($value, [$filter->getPhpFormat()]);
+					$dateTo->setTime(23, 59, 59);
 
-				$timestampTo = $dateTo->getTimestamp();
+					$timestampTo = $dateTo->getTimestamp();
 
-				$this->searchParamsBuilder->addRangeQuery($column, $timestampFrom, $timestampTo);
+					$this->searchParamsBuilder->addRangeQuery($column, $timestampFrom, $timestampTo);
+				} catch (DatagridDateTimeHelperException) {
+					// ignore the invalid filter value
+				}
 			}
 		}
 	}
@@ -112,17 +117,25 @@ public function applyFilterDateRange(FilterDateRange $filter): void
 			$timestampTo = null;
 
 			if ($values['from']) {
-				$dateFrom = DateTimeHelper::tryConvertToDateTime($values['from'], [$filter->getPhpFormat()]);
-				$dateFrom->setTime(0, 0, 0);
-
-				$timestampFrom = $dateFrom->getTimestamp();
+				try {
+					$dateFrom = DateTimeHelper::tryConvertToDateTime($values['from'], [$filter->getPhpFormat()]);
+					$dateFrom->setTime(0, 0, 0);
+
+					$timestampFrom = $dateFrom->getTimestamp();
+				} catch (DatagridDateTimeHelperException) {
+					// ignore the invalid filter value
+				}
 			}
 
 			if ($values['to']) {
-				$dateTo = DateTimeHelper::tryConvertToDateTime($values['to'], [$filter->getPhpFormat()]);
-				$dateTo->setTime(23, 59, 59);
-
-				$timestampTo = $dateTo->getTimestamp();
+				try {
+					$dateTo = DateTimeHelper::tryConvertToDateTime($values['to'], [$filter->getPhpFormat()]);
+					$dateTo->setTime(23, 59, 59);
+
+					$timestampTo = $dateTo->getTimestamp();
+				} catch (DatagridDateTimeHelperException) {
+					// ignore the invalid filter value
+				}
 			}
 
 			if (is_int($timestampFrom) || is_int($timestampTo)) {

tests/Cases/DataSources/ArrayDataSourceTest.phpt

@@ -3,7 +3,10 @@
 namespace Contributte\Datagrid\Tests\Cases\DataSources;
 
 use Contributte\Datagrid\DataSource\ArrayDataSource;
+use Contributte\Datagrid\Filter\FilterDate;
+use Contributte\Datagrid\Filter\FilterDateRange;
 use Contributte\Datagrid\Tests\Files\TestingDatagridFactory;
+use Tester\Assert;
 
 require __DIR__ . '/BaseDataSourceTest.phpt';
 
@@ -18,6 +21,51 @@ final class ArrayDataSourceTest extends BaseDataSourceTest
 		$this->grid = $factory->createTestingDatagrid();
 	}
 
+	public function testFilterDateWithInvalidValue(): void
+	{
+		$ds = new ArrayDataSource([
+			['id' => 1, 'date' => '1. 1. 2020'],
+			['id' => 2, 'date' => '15. 6. 2021'],
+		]);
+
+		$filter = new FilterDate($this->grid, 'date', 'Date', 'date');
+		$filter->setValue('not-a-date');
+
+		$ds->filter([$filter]);
+
+		Assert::same(0, $ds->getCount());
+	}
+
+	public function testFilterDateRangeWithInvalidFromValue(): void
+	{
+		$ds = new ArrayDataSource([
+			['id' => 1, 'date' => '1. 1. 2020'],
+			['id' => 2, 'date' => '15. 6. 2021'],
+		]);
+
+		$filter = new FilterDateRange($this->grid, 'date', 'Date', 'date', 'Date to');
+		$filter->setValue(['from' => 'not-a-date', 'to' => '']);
+
+		$ds->filter([$filter]);
+
+		Assert::same(0, $ds->getCount());
+	}
+
+	public function testFilterDateRangeWithInvalidToValue(): void
+	{
+		$ds = new ArrayDataSource([
+			['id' => 1, 'date' => '1. 1. 2020'],
+			['id' => 2, 'date' => '15. 6. 2021'],
+		]);
+
+		$filter = new FilterDateRange($this->grid, 'date', 'Date', 'date', 'Date to');
+		$filter->setValue(['from' => '', 'to' => 'not-a-date']);
+
+		$ds->filter([$filter]);
+
+		Assert::same(0, $ds->getCount());
+	}
+
 }
 
 (new ArrayDataSourceTest())->run();