Merge pull request #4314 from BacLuc/fix-datetimeimmutable-deprecation

api: fix "Passing an instance of DateTimeImmutable is deprecated"
ecamp · Dec 25, 2023 · 9754730 · 9754730
2 parents c11bb35 + 042bc4c
commit 9754730
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/api/src/Types/Doctrine/UTCDateTimeType.php b/api/src/Types/Doctrine/UTCDateTimeType.php
@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\DateTimeImmutableType;
 use Doctrine\DBAL\Types\DateTimeType;
 
 /**
@@ -38,6 +39,10 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
         if ($value instanceof \DateTime || $value instanceof \DateTimeImmutable) {
             $value = $value->setTimeZone(self::getUtc());
 
+            if ($value instanceof \DateTimeImmutable) {
+                return (new DateTimeImmutableType())->convertToDatabaseValue($value, $platform);
+            }
+
             return parent::convertToDatabaseValue($value, $platform);
         }
 

diff --git a/api/src/Types/Doctrine/UTCDateType.php b/api/src/Types/Doctrine/UTCDateType.php
@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\DateImmutableType;
 use Doctrine\DBAL\Types\DateType;
 
 class UTCDateType extends DateType {
@@ -23,6 +24,10 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
             $value = $value->setTimezone(self::getUtc());
         }
 
+        if ($value instanceof \DateTimeImmutable) {
+            return (new DateImmutableType())->convertToDatabaseValue($value, $platform);
+        }
+
         return parent::convertToDatabaseValue($value, $platform);
     }