apply review suggestions

garak · garak · commit 187cc9b884b6 · 2025-03-18T08:24:49.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -5,12 +5,12 @@ CHANGELOG
 ---
 
  * Reset the manager registry using native lazy objects when applicable
+* Add support for `Symfony\Component\Clock\DatePoint` as `DatePointType` Doctrine type
 
 7.2
 ---
 
  * Accept `ReadableCollection` in `CollectionToArrayTransformer`
- * Add support for `Symfony\Component\Clock\DatePoint` as `DatePointType` Doctrine type
 
 7.1
 ---
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterDatePointTypePass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterDatePointTypePass.php
@@ -28,12 +28,10 @@ public function process(ContainerBuilder $container): void
             return;
         }
 
-        $typeDefinition = $container->getParameter('doctrine.dbal.connection_factory.types');
+        $types = $container->getParameter('doctrine.dbal.connection_factory.types');
 
-        if (is_array($typeDefinition) && !isset($typeDefinition['date_point'])) {
-            $typeDefinition['date_point'] = ['class' => DatePointType::class];
-        }
+        $types['date_point'] ??= ['class' => DatePointType::class];
 
-        $container->setParameter('doctrine.dbal.connection_factory.types', $typeDefinition);
+        $container->setParameter('doctrine.dbal.connection_factory.types', $types);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Types/DatePointTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Types/DatePointTypeTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Types;
 
-use DateTimeImmutable;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
@@ -72,7 +71,7 @@ public function testNullConvertsToPHPValue()
     public function testDateTimeImmutableConvertsToPHPValue()
     {
         $format = 'Y-m-d H:i:s';
-        $dateTime = new DateTimeImmutable('2025-03-03 12:13:14');
+        $dateTime = new \DateTimeImmutable('2025-03-03 12:13:14');
         $actual = $this->type->convertToPHPValue($dateTime, new SqlitePlatform());
         $expected = DatePoint::createFromInterface($dateTime);
 
diff --git a/src/Symfony/Bridge/Doctrine/Types/DatePointType.php b/src/Symfony/Bridge/Doctrine/Types/DatePointType.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Types;
 
-use DateTimeInterface;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\DateTimeImmutableType;
 use Symfony\Component\Clock\DatePoint;

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,10 @@ public function process(ContainerBuilder $container): void`
`28`	`28`	`return;`
`29`	`29`	`}`
`30`	`30`
`31`		`- $typeDefinition = $container->getParameter('doctrine.dbal.connection_factory.types');`
	`31`	`+ $types = $container->getParameter('doctrine.dbal.connection_factory.types');`
`32`	`32`
`33`		`- if (is_array($typeDefinition) && !isset($typeDefinition['date_point'])) {`
`34`		`- $typeDefinition['date_point'] = ['class' => DatePointType::class];`
`35`		`- }`
	`33`	`+ $types['date_point'] ??= ['class' => DatePointType::class];`
`36`	`34`
`37`		`- $container->setParameter('doctrine.dbal.connection_factory.types', $typeDefinition);`
	`35`	`+ $container->setParameter('doctrine.dbal.connection_factory.types', $types);`
`38`	`36`	`}`
`39`	`37`	`}`