add array check

garak · garak · commit 6bc479d52bce · 2025-03-08T18:17:28.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterDatePointTypePass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterDatePointTypePass.php
@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container): void
 
         $typeDefinition = $container->getParameter('doctrine.dbal.connection_factory.types');
 
-        if (!isset($typeDefinition['date_point'])) {
+        if (is_array($typeDefinition) && !isset($typeDefinition['date_point'])) {
             $typeDefinition['date_point'] = ['class' => DatePointType::class];
         }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterDatePointTypePassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterDatePointTypePassTest.php
@@ -14,10 +14,18 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterDatePointTypePass;
 use Symfony\Bridge\Doctrine\Types\DatePointType;
+use Symfony\Component\Clock\DatePoint;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class RegisterDatePointTypePassTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        if (!class_exists(DatePoint::class)) {
+            self::markTestSkipped('The DatePoint class is not available.');
+        }
+    }
+
     public function testRegistered()
     {
         $container = new ContainerBuilder();
@@ -30,12 +38,4 @@ public function testRegistered()
         ];
         $this->assertSame($expected, $container->getParameter('doctrine.dbal.connection_factory.types'));
     }
-
-    public function testRegisteredDontFail()
-    {
-        $container = new ContainerBuilder();
-        (new RegisterDatePointTypePass())->process($container);
-
-        $this->expectNotToPerformAssertions();
-    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Types/DatePointTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Types/DatePointTypeTest.php
@@ -14,7 +14,6 @@
 use DateTimeImmutable;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Types\ConversionException;
@@ -39,10 +38,10 @@ public static function setUpBeforeClass(): void
 
     protected function setUp(): void
     {
-        $this->type = Type::getType(DatePointType::NAME);
         if (!class_exists(DatePoint::class)) {
             self::markTestSkipped('The DatePoint class is not available.');
         }
+        $this->type = Type::getType(DatePointType::NAME);
     }
 
     public function testDatePointConvertsToDatabaseValue()
@@ -57,7 +56,6 @@ public function testDatePointConvertsToDatabaseValue()
 
     public function testDatePointConvertsToPHPValue()
     {
-    
         $datePoint = new DatePoint();
         $actual = $this->type->convertToPHPValue($datePoint, new SqlitePlatform());
 
diff --git a/src/Symfony/Bridge/Doctrine/Types/DatePointType.php b/src/Symfony/Bridge/Doctrine/Types/DatePointType.php
@@ -13,26 +13,29 @@
 
 use DateTimeInterface;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\DateTimeImmutableType;
 use Symfony\Component\Clock\DatePoint;
 
 final class DatePointType extends DateTimeImmutableType
 {
     public const NAME = 'date_point';
 
+    /**
+      * @param T $value
+      *
+      * @return (T is null ? null : DatePoint)
+      *
+      * @template T
+      */
     public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?DatePoint
     {
         if (null === $value || $value instanceof DatePoint) {
             return $value;
         }
 
         $value = parent::convertToPHPValue($value, $platform);
-        if ($value instanceof DateTimeInterface) {
-            return DatePoint::createFromInterface($value);
-        }
 
-        throw new ConversionException();
+        return DatePoint::createFromInterface($value);
     }
 
     public function getName(): string

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container): void`
`30`	`30`
`31`	`31`	`$typeDefinition = $container->getParameter('doctrine.dbal.connection_factory.types');`
`32`	`32`
`33`		`- if (!isset($typeDefinition['date_point'])) {`
	`33`	`+ if (is_array($typeDefinition) && !isset($typeDefinition['date_point'])) {`
`34`	`34`	`$typeDefinition['date_point'] = ['class' => DatePointType::class];`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use DateTimeImmutable;`
`15`	`15`	`use Doctrine\DBAL\Platforms\AbstractPlatform;`
`16`	`16`	`use Doctrine\DBAL\Platforms\MariaDBPlatform;`
`17`		`-use Doctrine\DBAL\Platforms\MySQLPlatform;`
`18`	`17`	`use Doctrine\DBAL\Platforms\PostgreSQLPlatform;`
`19`	`18`	`use Doctrine\DBAL\Platforms\SqlitePlatform;`
`20`	`19`	`use Doctrine\DBAL\Types\ConversionException;`
`@@ -39,10 +38,10 @@ public static function setUpBeforeClass(): void`
`39`	`38`
`40`	`39`	`protected function setUp(): void`
`41`	`40`	`{`
`42`		`- $this->type = Type::getType(DatePointType::NAME);`
`43`	`41`	`if (!class_exists(DatePoint::class)) {`
`44`	`42`	`self::markTestSkipped('The DatePoint class is not available.');`
`45`	`43`	`}`
	`44`	`+ $this->type = Type::getType(DatePointType::NAME);`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`public function testDatePointConvertsToDatabaseValue()`
`@@ -57,7 +56,6 @@ public function testDatePointConvertsToDatabaseValue()`
`57`	`56`
`58`	`57`	`public function testDatePointConvertsToPHPValue()`
`59`	`58`	`{`
`60`		`-`
`61`	`59`	`$datePoint = new DatePoint();`
`62`	`60`	`$actual = $this->type->convertToPHPValue($datePoint, new SqlitePlatform());`
`63`	`61`