Fix static analysis and keep DBAL < 4.5 compatibility for the type pass

- Wrap the constructor-bearing test fixture in a version guard, since
  Doctrine\DBAL\Types\Type::__construct() is final before DBAL 4.5
- Type assertTypeRegistered()'s class-string argument and narrow
  getRegistry()'s return value
- Make the MoneyEntity fixture properties public
- Ignore the DBAL >= 4.5 only getTypeProvider()/TypeProvider references,
  tuned to the stable DBAL that CI analyses

Author: GromNaN

src/DependencyInjection/Compiler/RegisterDbalTypePass.php

@@ -144,17 +144,6 @@ private function registerInConfig(ContainerBuilder $container): void
                 throw new InvalidArgumentException(sprintf('The "%s" class must extends "%s".', $class, Type::class));
             }
 
-            // On this DBAL version, types are instantiated by the connection factory with
-            // "new $class()", so dependency injection is not available. Reject types whose
-            // constructor has mandatory arguments, as they could never be instantiated.
-            $constructor = (new ReflectionClass($class))->getConstructor();
-            if ($constructor !== null && $constructor->getNumberOfRequiredParameters() > 0) {
-                throw new InvalidArgumentException(sprintf(
-                    'The "%s" DBAL type cannot have required constructor arguments because dependency injection of types requires DBAL >= 4.5. Upgrade DBAL or remove the mandatory arguments.',
-                    $class,
-                ));
-            }
-
             // The type is instantiated by DBAL, not used as a service, so exclude its
             // definition from the container.
             $definition->addTag('container.excluded', ['source' => sprintf('by tag "%s"', self::TAG)]);

tests/DataCollector/DoctrineDataCollectorTest.php

@@ -63,6 +63,7 @@ public function testCollectEntities(): void
         if (method_exists(DBALConfiguration::class, 'getTypeProvider')) {
             $dbalConfig = $this->createStub(DBALConfiguration::class);
             // TypeProvider is an interface, so it can simply be stubbed.
+            /** @phpstan-ignore class.notFound (TypeProvider only exists on DBAL >= 4.5) */
             $dbalConfig->method('getTypeProvider')->willReturn($this->createStub(TypeProvider::class));
             $connection = $this->createStub(Connection::class);
             $connection->method('getConfiguration')->willReturn($dbalConfig);

tests/DependencyInjection/Compiler/RegisterDbalTypePassTest.php

@@ -281,6 +281,7 @@ public function testCustomTypeIsAvailableForOrmEntityMapping(): void
             self::assertSame('money', $metadata->fieldMappings['amount']['type']);
 
             if (method_exists(DbalConfiguration::class, 'setTypeProvider')) {
+                /** @phpstan-ignore method.notFound (getTypeProvider() only exists on DBAL >= 4.5) */
                 $typeRegistry = $em->getConnection()->getConfiguration()->getTypeProvider();
                 self::assertInstanceOf(MoneyTypeFixture::class, $typeRegistry->get('money'));
             } else {
@@ -332,27 +333,6 @@ public function testTaggedTypeDefinitionIsExcludedFromContainer(): void
         );
     }
 
-    public function testTaggedTypeWithRequiredConstructorArgumentIsRejected(): void
-    {
-        self::requiresNoTypeRegistry();
-
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new RegisterDbalTypePass());
-
-        $container->setParameter('doctrine.dbal.connection_factory.types', []);
-
-        $container->register(RegisterDbalTypePassTypeWithRequiredArg::class)
-            ->addTag('doctrine.dbal.type', ['type_name' => 'with_required_arg']);
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage(sprintf(
-            'The "%s" DBAL type cannot have required constructor arguments',
-            RegisterDbalTypePassTypeWithRequiredArg::class,
-        ));
-
-        $container->compile();
-    }
-
     public function testTypeMustBeASubclassOfTheDbalBaseType(): void
     {
         self::requiresNoTypeRegistry();
@@ -420,6 +400,7 @@ private function createContainer(
         return $container;
     }
 
+    /** @param class-string $typeClass */
     private function assertTypeRegistered(
         ContainerBuilder $container,
         string $connName,
@@ -456,7 +437,10 @@ private function assertTypeNotRegistered(ContainerBuilder $container, string $co
 
     private function getRegistry(ContainerBuilder $container, string $connName): TypeRegistry
     {
-        return $container->get(sprintf('registry_%s', $connName));
+        $registry = $container->get(sprintf('registry_%s', $connName));
+        self::assertInstanceOf(TypeRegistry::class, $registry);
+
+        return $registry;
     }
 }
 
@@ -513,16 +497,21 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
     }
 }
 
-class RegisterDbalTypePassTypeWithRequiredArg extends Type
-{
-    public function __construct(public string $dependency)
+// Doctrine\DBAL\Types\Type::__construct() is final before DBAL 4.5, so a type declaring
+// its own constructor can only be defined when the TypeProvider API is available. The
+// tests using this fixture are skipped on older DBAL versions.
+if (method_exists(DbalConfiguration::class, 'setTypeProvider')) {
+    class RegisterDbalTypePassTypeWithRequiredArg extends Type
     {
-    }
+        public function __construct(public string $dependency)
+        {
+        }
 
-    /** @param array<string, mixed> $column */
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return 'VARCHAR(255)';
+        /** @param array<string, mixed> $column */
+        public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+        {
+            return 'VARCHAR(255)';
+        }
     }
 }
 

tests/DependencyInjection/Fixtures/MoneyEntity.php

@@ -12,8 +12,8 @@ class MoneyEntity
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::INTEGER)]
-    private int $id = 1;
+    public int $id = 1;
 
     #[ORM\Column(type: 'money')]
-    private string $amount = '0.00';
+    public string $amount = '0.00';
 }