Wire the per-connection type provider via setTypeProvider()

DBAL 4.5 renamed the Configuration accessors to get/setTypeProvider(), typed
against the new TypeProvider interface. The version guard has to follow the
rename: method_exists() on the old name would silently take the DBAL < 4.5
branch, leaving per-connection registries unwired with no error.

DoctrineDataCollectorTest can now stub TypeProvider instead of instantiating a
real TypeRegistry, which the final class made impossible.

Author: GromNaN

src/DependencyInjection/Compiler/RegisterDbalTypePass.php

@@ -40,7 +40,7 @@ public static function autoconfigureFromAttribute(ChildDefinition $definition, A
 
     public function process(ContainerBuilder $container): void
     {
-        if (method_exists(DbalConfiguration::class, 'setTypeRegistry')) {
+        if (method_exists(DbalConfiguration::class, 'setTypeProvider')) {
             $this->registerInTypeRegistry($container);
         } else {
             $this->registerInConfig($container);
@@ -115,10 +115,10 @@ private function registerInTypeRegistry(ContainerBuilder $container): void
 
             $container
                 ->getDefinition(sprintf('doctrine.dbal.%s_connection.configuration', $name))
-                ->addMethodCall('setTypeRegistry', [$registryRef]);
+                ->addMethodCall('setTypeProvider', [$registryRef]);
 
             foreach ($connectionToOrmConfigs[$name] ?? [] as $ormConfigId) {
-                $container->getDefinition($ormConfigId)->addMethodCall('setTypeRegistry', [$registryRef]);
+                $container->getDefinition($ormConfigId)->addMethodCall('setTypeProvider', [$registryRef]);
             }
         }
     }

tests/DataCollector/DoctrineDataCollectorTest.php

@@ -8,7 +8,7 @@
 use Doctrine\DBAL\Configuration as DBALConfiguration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Types\TypeRegistry;
+use Doctrine\DBAL\Types\TypeProvider;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -60,9 +60,10 @@ public function testCollectEntities(): void
 
         $manager->method('getMetadataFactory')->willReturn($factory);
         $manager->method('getConfiguration')->willReturn($config);
-        if (method_exists(DBALConfiguration::class, 'getTypeRegistry')) {
+        if (method_exists(DBALConfiguration::class, 'getTypeProvider')) {
             $dbalConfig = $this->createStub(DBALConfiguration::class);
-            $dbalConfig->method('getTypeRegistry')->willReturn(new TypeRegistry());
+            // TypeProvider is an interface, so it can simply be stubbed.
+            $dbalConfig->method('getTypeProvider')->willReturn($this->createStub(TypeProvider::class));
             $connection = $this->createStub(Connection::class);
             $connection->method('getConfiguration')->willReturn($dbalConfig);
             $manager->method('getConnection')->willReturn($connection);

tests/DependencyInjection/Compiler/RegisterDbalTypePassTest.php

@@ -41,7 +41,7 @@ class RegisterDbalTypePassTest extends TestCase
 {
     private static function requiresTypeRegistry(): void
     {
-        if (method_exists(DbalConfiguration::class, 'setTypeRegistry')) {
+        if (method_exists(DbalConfiguration::class, 'setTypeProvider')) {
             return;
         }
 
@@ -50,7 +50,7 @@ private static function requiresTypeRegistry(): void
 
     private static function requiresNoTypeRegistry(): void
     {
-        if (! method_exists(DbalConfiguration::class, 'setTypeRegistry')) {
+        if (! method_exists(DbalConfiguration::class, 'setTypeProvider')) {
             return;
         }
 
@@ -67,7 +67,7 @@ public function testNoTaggedTypesSkipsTypeRegistrySetup(): void
         });
 
         foreach ($container->getDefinition('conf_conn1')->getMethodCalls() as [$method]) {
-            self::assertNotSame('setTypeRegistry', $method);
+            self::assertNotSame('setTypeProvider', $method);
         }
     }
 
@@ -222,13 +222,13 @@ public function testTypeRegistryIsSetOnConfiguration(): void
             $container->setAlias('conf_conn1', 'doctrine.dbal.conn1_connection.configuration')->setPublic(true);
         });
 
-        $setTypeRegistryCalls = array_filter(
+        $setTypeProviderCalls = array_filter(
             $container->getDefinition('conf_conn1')->getMethodCalls(),
-            static fn (array $call): bool => $call[0] === 'setTypeRegistry',
+            static fn (array $call): bool => $call[0] === 'setTypeProvider',
         );
 
-        self::assertCount(1, $setTypeRegistryCalls);
-        $registryArg = array_values($setTypeRegistryCalls)[0][1][0];
+        self::assertCount(1, $setTypeProviderCalls);
+        $registryArg = array_values($setTypeProviderCalls)[0][1][0];
 
         if ($registryArg instanceof Reference) {
             $registryArg = $container->getDefinition((string) $registryArg);
@@ -254,12 +254,12 @@ static function (ContainerBuilder $container): void {
         );
 
         foreach (['orm_conf_conn1', 'orm_conf_conn2'] as $alias) {
-            $setTypeRegistryCalls = array_filter(
+            $setTypeProviderCalls = array_filter(
                 $container->getDefinition($alias)->getMethodCalls(),
-                static fn (array $call): bool => $call[0] === 'setTypeRegistry',
+                static fn (array $call): bool => $call[0] === 'setTypeProvider',
             );
 
-            self::assertCount(1, $setTypeRegistryCalls, sprintf('setTypeRegistry not called on %s', $alias));
+            self::assertCount(1, $setTypeProviderCalls, sprintf('setTypeProvider not called on %s', $alias));
         }
     }
 
@@ -280,8 +280,8 @@ public function testCustomTypeIsAvailableForOrmEntityMapping(): void
             $metadata = $em->getClassMetadata(MoneyEntity::class);
             self::assertSame('money', $metadata->fieldMappings['amount']['type']);
 
-            if (method_exists(DbalConfiguration::class, 'setTypeRegistry')) {
-                $typeRegistry = $em->getConnection()->getConfiguration()->getTypeRegistry();
+            if (method_exists(DbalConfiguration::class, 'setTypeProvider')) {
+                $typeRegistry = $em->getConnection()->getConfiguration()->getTypeProvider();
                 self::assertInstanceOf(MoneyTypeFixture::class, $typeRegistry->get('money'));
             } else {
                 self::assertTrue(Type::hasType('money'));