Merge fe46565 into cca97a6

zfcampus · Sep 13, 2019 · d685096 · d685096
2 parents cca97a6 + fe46565
commit d685096
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/src/Filter/ORM/AbstractFilter.php b/src/Filter/ORM/AbstractFilter.php
@@ -7,6 +7,7 @@
 namespace ZF\Doctrine\QueryBuilder\Filter\ORM;
 
 use DateTime;
+use DateTimeImmutable;
 use ZF\Doctrine\QueryBuilder\Filter\FilterInterface;
 use ZF\Doctrine\QueryBuilder\Filter\Service\ORMFilterManager;
 
@@ -64,6 +65,16 @@ protected function typeCastField($metadata, $field, $value, $format, $doNotTypec
                     $value = DateTime::createFromFormat('Y-m-d H:i:s', $value->format('Y-m-d') . ' 00:00:00');
                 }
                 break;
+            case 'date_immutable':
+                // For dates set time to midnight
+                if ($value && ! $doNotTypecastDatetime) {
+                    if (! $format) {
+                        $format = 'Y-m-d';
+                    }
+                    $value = DateTimeImmutable::createFromFormat($format, $value);
+                    $value = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $value->format('Y-m-d') . ' 00:00:00');
+                }
+                break;
             case 'time':
                 if ($value && ! $doNotTypecastDatetime) {
                     if (! $format) {
@@ -72,6 +83,14 @@ protected function typeCastField($metadata, $field, $value, $format, $doNotTypec
                     $value = DateTime::createFromFormat($format, $value);
                 }
                 break;
+            case 'time_immutable':
+                if ($value && ! $doNotTypecastDatetime) {
+                    if (! $format) {
+                        $format = 'H:i:s';
+                    }
+                    $value = DateTimeImmutable::createFromFormat($format, $value);
+                }
+                break;
             case 'datetime':
                 if ($value && ! $doNotTypecastDatetime) {
                     if (! $format) {
@@ -80,6 +99,14 @@ protected function typeCastField($metadata, $field, $value, $format, $doNotTypec
                     $value = DateTime::createFromFormat($format, $value);
                 }
                 break;
+            case 'datetime_immutable':
+                if ($value && ! $doNotTypecastDatetime) {
+                    if (! $format) {
+                        $format = 'Y-m-d H:i:s';
+                    }
+                    $value = DateTimeImmutable::createFromFormat($format, $value);
+                }
+                break;
             default:
                 break;
         }