Allow mixed type value when apply to DateFilter.

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 2.7.0
 
 * Doctrine: Better exception to find which resource is linked to an exception (#3965)
+* Doctrine: Allow mixed type value for date filter (notice if invalid) (#3870)
 * MongoDB: `date_immutable` support (#3940)
 
 ## 2.6.3

src/Bridge/Doctrine/Common/Filter/DateFilterTrait.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait;
+use ApiPlatform\Core\Exception\InvalidArgumentException;
 
 /**
  * Trait for filtering the collection by date intervals.
@@ -79,4 +80,17 @@ protected function getFilterDescription(string $property, string $period): array
             ],
         ];
     }
+
+    private function normalizeValue($value, string $operator): ?string
+    {
+        if (false === \is_string($value)) {
+            $this->getLogger()->notice('Invalid filter ignored', [
+                'exception' => new InvalidArgumentException(sprintf('Invalid value for "[%s]", expected string', $operator)),
+            ]);
+
+            return null;
+        }
+
+        return $value;
+    }
 }

src/Bridge/Doctrine/MongoDbOdm/Filter/DateFilter.php

@@ -108,8 +108,14 @@ protected function filterProperty(string $property, $values, Builder $aggregatio
     /**
      * Adds the match stage according to the chosen null management.
      */
-    private function addMatch(Builder $aggregationBuilder, string $field, string $operator, string $value, string $nullManagement = null): void
+    private function addMatch(Builder $aggregationBuilder, string $field, string $operator, $value, string $nullManagement = null): void
     {
+        $value = $this->normalizeValue($value, $operator);
+
+        if (null === $value) {
+            return;
+        }
+
         try {
             $value = new \DateTime($value);
         } catch (\Exception $e) {

src/Bridge/Doctrine/Orm/Filter/DateFilter.php

@@ -128,9 +128,15 @@ protected function filterProperty(string $property, $values, QueryBuilder $query
      *
      * @param string|DBALType $type
      */
-    protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $alias, string $field, string $operator, string $value, string $nullManagement = null, $type = null)
+    protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $alias, string $field, string $operator, $value, string $nullManagement = null, $type = null)
     {
         $type = (string) $type;
+        $value = $this->normalizeValue($value, $operator);
+
+        if (null === $value) {
+            return;
+        }
+
         try {
             $value = false === strpos($type, '_immutable') ? new \DateTime($value) : new \DateTimeImmutable($value);
         } catch (\Exception $e) {

tests/Bridge/Doctrine/Common/Filter/DateFilterTestTrait.php

@@ -220,6 +220,7 @@ private function provideApplyTestArguments(): array
                 [
                     'dummyDate' => [
                         'after' => '1932iur123ufqe',
+                        'before' => [],
                     ],
                 ],
             ],