[TASK] Extract DateTime to-database transformation from DataHandler

Add QueryHelper::transformDateTimeToDatabaseValue for later use in
extbase persistence layer.

Also make use of DateTimeFactory for UTC timestamp conversion
to localtime \DateTimeImmutable objects.

Resolves: #106461
Releases: main, 13.4
Change-Id: Ib981aaa972eb9cb91fe438ad4702ff45fa2c3a6c
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88835
Reviewed-by: Benjamin Franzke <ben@bnf.dev>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Benjamin Franzke <ben@bnf.dev>

Author: bnf

typo3/sysext/core/Classes/DataHandling/DataHandler.php

@@ -49,6 +49,7 @@
 use TYPO3\CMS\Core\DataHandling\Localization\DataMapProcessor;
 use TYPO3\CMS\Core\DataHandling\Model\CorrelationId;
 use TYPO3\CMS\Core\DataHandling\Model\RecordStateFactory;
+use TYPO3\CMS\Core\Domain\DateTimeFactory;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Html\RteHtmlParser;
 use TYPO3\CMS\Core\LinkHandling\Exception\UnknownLinkHandlerException;
@@ -2002,19 +2003,16 @@ protected function checkValueForDatetime(int|string|\DateTimeInterface|null $val
         // Handle native date/time fields
         $isNativeDateTimeField = false;
         $isNullable = $tcaFieldConf['nullable'] ?? false;
-        $nullValue = $isNullable ? null : 0;
-        $nativeDateTimeFieldFormat = null;
         $nativeDateTimeType = $tcaFieldConf['dbType'] ?? null;
         if (in_array($nativeDateTimeType, QueryHelper::getDateTimeTypes(), true)) {
-            $isNativeDateTimeField = true;
             $isNullable = $tcaFieldConf['nullable'] ?? true;
             $dateTimeFormats = QueryHelper::getDateTimeFormats();
-            $nativeDateTimeFieldFormat = $dateTimeFormats[$nativeDateTimeType]['format'];
             $nativeDateTimeFieldEmptyValue = $dateTimeFormats[$nativeDateTimeType]['empty'];
-            $nullValue = $isNullable ? null : $nativeDateTimeFieldEmptyValue;
             if ($value === $nativeDateTimeFieldEmptyValue && $nativeDateTimeType !== 'time') {
                 $value = null;
             }
+        } else {
+            $nativeDateTimeType = null;
         }
 
         if (!$this->validateValueForRequired($tcaFieldConf, $value instanceof \DateTimeInterface ? $value->format(\DateTimeInterface::ATOM) : (string)$value)) {
@@ -2029,9 +2027,9 @@ protected function checkValueForDatetime(int|string|\DateTimeInterface|null $val
             $datetime = match (true) {
                 $value === null => null,
                 $value instanceof \DateTimeImmutable => $value,
-                $value instanceof \DateTime => \DateTimeImmutable::createFromMutable($value),
+                $value instanceof \DateTimeInterface => \DateTimeImmutable::createFromInterface($value),
                 // Unix timestamp
-                is_int($value) || MathUtility::canBeInterpretedAsInteger($value) => new \DateTimeImmutable('@' . $value),
+                is_int($value) || MathUtility::canBeInterpretedAsInteger($value) => DateTimeFactory::createFromTimestamp($value),
                 // The value we receive from the backend form is an unqualified ISO 8601 date,
                 // for instance "1999-11-11T11:11:11".
                 // We can also accept an ISO8601 date with offsets,
@@ -2044,47 +2042,19 @@ protected function checkValueForDatetime(int|string|\DateTimeInterface|null $val
             $datetime = null;
         }
 
-        if ($datetime === null) {
-            return ['value' => $nullValue];
-        }
-
-        // Apply format-specific normalizations
-        if ($format === 'time') {
-            // time(sec) is stored as elapsed seconds in DB, hence we interpret it as time on 1970-01-01
-            $datetime = $datetime->setDate(1970, 01, 01)->setTime((int)$datetime->format('H'), (int)$datetime->format('i'), 0);
-        } elseif ($format === 'timesec' || $nativeDateTimeType === 'time') {
-            $datetime = $datetime->setDate(1970, 01, 01);
-        } elseif ($format === 'date' || $nativeDateTimeType === 'date') {
-            $datetime = $datetime->setTime(0, 0, 0);
-        }
-
-        $upper = isset($tcaFieldConf['range']['upper']) ? new \DateTimeImmutable('@' . $tcaFieldConf['range']['upper']) : null;
-        if ($upper !== null && $datetime > $upper) {
-            $datetime = $upper;
-        }
-
-        $lower = isset($tcaFieldConf['range']['lower']) ? new \DateTimeImmutable('@' . $tcaFieldConf['range']['lower']) : null;
-        if ($lower !== null && $datetime < $lower) {
-            $datetime = $lower;
-        }
-
-        // Handle native date/time fields
-        if ($isNativeDateTimeField) {
-            if ($nativeDateTimeType === 'datetime') {
-                // native DATETIME values are stored in server LOCALTIME. Force conversion to the servers current timezone.
-                $datetime = $datetime->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+        if ($datetime !== null) {
+            $upper = isset($tcaFieldConf['range']['upper']) ? DateTimeFactory::createFromTimestamp((int)$tcaFieldConf['range']['upper']) : null;
+            if ($upper !== null && $datetime > $upper) {
+                $datetime = $upper;
             }
-            // Format the value back to a date(time) string
-            return ['value' => $datetime->format($nativeDateTimeFieldFormat)];
-        }
 
-        if ($format === 'timesec' || $format === 'time') {
-            // Time is stored in seconds for integer fields
-            return ['value' => (int)$datetime->format('H') * 3600 + (int)$datetime->format('i') * 60 + (int)$datetime->format('s')];
+            $lower = isset($tcaFieldConf['range']['lower']) ? DateTimeFactory::createFromTimestamp((int)$tcaFieldConf['range']['lower']) : null;
+            if ($lower !== null && $datetime < $lower) {
+                $datetime = $lower;
+            }
         }
 
-        // Encode as unix timestamp (int) if no native field is used
-        return ['value' => $datetime->getTimestamp()];
+        return ['value' => QueryHelper::transformDateTimeToDatabaseValue($datetime, $isNullable, $format, $nativeDateTimeType)];
     }
 
     /**

typo3/sysext/core/Classes/Database/Query/QueryHelper.php

@@ -217,6 +217,57 @@ public static function getDateTimeTypes(): array
         ];
     }
 
+    public static function transformDateTimeToDatabaseValue(
+        ?\DateTimeInterface $datetime,
+        bool $isNullable,
+        string $format,
+        ?string $persistenceType,
+    ): int|string|null {
+        if ($datetime === null) {
+            if ($isNullable) {
+                return null;
+            }
+            if ($persistenceType === null) {
+                return 0;
+            }
+            return self::getDateTimeFormats()[$persistenceType]['empty'] ?? null;
+        }
+
+        if (!$datetime instanceof \DateTimeImmutable) {
+            $datetime = \DateTimeImmutable::createFromInterface($datetime);
+        }
+
+        // Apply format-specific normalizations
+        if ($format === 'time') {
+            // time(sec) is stored as elapsed seconds in DB, hence we base the time on 1970-01-01
+            $datetime = $datetime->setDate(1970, 01, 01)->setTime((int)$datetime->format('H'), (int)$datetime->format('i'), 0);
+        } elseif ($format === 'timesec' || $persistenceType === 'time') {
+            $datetime = $datetime->setDate(1970, 01, 01);
+        } elseif ($format === 'date' || $persistenceType === 'date') {
+            $datetime = $datetime->setTime(0, 0, 0);
+        }
+
+        // Native DATETIME, DATE or TIME field
+        if (in_array($persistenceType, self::getDateTimeTypes(), true)) {
+            $dateTimeFormats = self::getDateTimeFormats();
+            $persistenceFormat = $dateTimeFormats[$persistenceType]['format'];
+            if ($persistenceType === 'datetime') {
+                // native DATETIME values are stored in server LOCALTIME. Force conversion to the servers current timezone.
+                $datetime = $datetime->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+            }
+
+            return $datetime->format($persistenceFormat);
+        }
+
+        // Time is stored in seconds for integer fields
+        if ($format === 'timesec' || $format === 'time') {
+            return (int)$datetime->format('H') * 3600 + (int)$datetime->format('i') * 60 + (int)$datetime->format('s');
+        }
+
+        // Encode as unix timestamp (int) if no native field is used
+        return $datetime->getTimestamp();
+    }
+
     /**
      * Quote database table/column names indicated by {#identifier} markup in a SQL fragment string.
      * This is an intermediate step to make SQL fragments in Typoscript and TCA database agnostic.