also reject \DateTime subclasses

xabbuh · xabbuh · commit afe4966583c4 · 2025-05-23T13:55:34.000+02:00
diff --git a/src/Symfony/Component/JsonStreamer/Mapping/Read/DateTimeTypePropertyMetadataLoader.php b/src/Symfony/Component/JsonStreamer/Mapping/Read/DateTimeTypePropertyMetadataLoader.php
@@ -38,7 +38,7 @@ public function load(string $className, array $options = [], array $context = []
             $type = $metadata->getType();
 
             if ($type instanceof ObjectType && is_a($type->getClassName(), \DateTimeInterface::class, true)) {
-                if (\DateTime::class === $type->getClassName()) {
+                if (\DateTime::class === $type->getClassName() || is_a($type->getClassName(), \DateTime::class, true)) {
                     throw new InvalidArgumentException('The "DateTime" class is not supported. Use "DateTimeImmutable" instead.');
                 }
 
diff --git a/src/Symfony/Component/JsonStreamer/Tests/Mapping/Read/DateTimeTypePropertyMetadataLoaderTest.php b/src/Symfony/Component/JsonStreamer/Tests/Mapping/Read/DateTimeTypePropertyMetadataLoaderTest.php
@@ -47,6 +47,18 @@ public function testThrowWhenDateTimeType()
         $loader->load(self::class);
     }
 
+    public function testThrowWhenDateTimeSubclassType()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "DateTime" class is not supported. Use "DateTimeImmutable" instead.');
+
+        $loader = new DateTimeTypePropertyMetadataLoader(self::propertyMetadataLoader([
+            'mutable' => new PropertyMetadata('mutable', Type::object(DateTimeChild::class)),
+        ]));
+
+        $loader->load(self::class);
+    }
+
     /**
      * @param array<string, PropertyMetadata> $propertiesMetadata
      */
@@ -64,3 +76,7 @@ public function load(string $className, array $options = [], array $context = []
         };
     }
 }
+
+class DateTimeChild extends \DateTime
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function load(string $className, array $options = [], array $context = []`
`38`	`38`	`$type = $metadata->getType();`
`39`	`39`
`40`	`40`	`if ($type instanceof ObjectType && is_a($type->getClassName(), \DateTimeInterface::class, true)) {`
`41`		`- if (\DateTime::class === $type->getClassName()) {`
	`41`	`+ if (\DateTime::class === $type->getClassName() \|\| is_a($type->getClassName(), \DateTime::class, true)) {`
`42`	`42`	`throw new InvalidArgumentException('The "DateTime" class is not supported. Use "DateTimeImmutable" instead.');`
`43`	`43`	`}`
`44`	`44`