move autoconfiguration callback in the compiler pass

Author: syl20b

src/DependencyInjection/Compiler/RegisterDbalTypePass.php

@@ -4,7 +4,10 @@
 
 namespace Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler;
 
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsDatabaseType;
 use Doctrine\DBAL\Types\Type;
+use ReflectionClass;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -17,6 +20,30 @@
 /** @internal */
 final class RegisterDbalTypePass implements CompilerPassInterface
 {
+    private const string TAG = 'doctrine.dbal.type';
+
+    /**
+     * @param ReflectionClass<T> $reflector
+     *
+     * @template T of ReflectionClass
+     */
+    public static function autoconfigureFromAttribute(ChildDefinition $definition, AsDatabaseType $type, ReflectionClass $reflector): void
+    {
+        $attributes = [
+            'name' => $type->name ?? $reflector->name,
+        ];
+
+        // Determine if the version of symfony/dependency-injection is >= 7.3
+        /** @phpstan-ignore function.alreadyNarrowedType */
+        if (method_exists($definition, 'addResourceTag')) {
+            $definition->addResourceTag(self::TAG, $attributes);
+        } else {
+            // Needed to keep compatibility with symfony/dependency-injection < 7.3
+            $definition->addTag(self::TAG, $attributes)
+                ->addTag('container.excluded', ['source' => sprintf('by tag "%s"', self::TAG)]);
+        }
+    }
+
     public function process(ContainerBuilder $container): void
     {
         $types = $container->getParameter('doctrine.dbal.connection_factory.types');
@@ -46,35 +73,33 @@ public function process(ContainerBuilder $container): void
     /** @return array<string, array<array{name?: string}>> */
     private function findTaggedResourceIds(ContainerBuilder $container): array
     {
-        $tagName = 'doctrine.dbal.type';
-
         // Determine if the version of symfony/dependency-injection is >= 7.3
         /** @phpstan-ignore function.alreadyNarrowedType */
         if (method_exists($container, 'findTaggedResourceIds')) {
-            return $container->findTaggedResourceIds($tagName);
+            return $container->findTaggedResourceIds(self::TAG);
         }
 
         // Needed to keep compatibility with symfony/dependency-injection < 7.3
         $tags = [];
         foreach ($container->getDefinitions() as $id => $definition) {
-            if (! $definition->hasTag($tagName)) {
+            if (! $definition->hasTag(self::TAG)) {
                 continue;
             }
 
             if (! $definition->hasTag('container.excluded')) {
-                throw new InvalidArgumentException(sprintf('The resource "%s" tagged "%s" is missing the "container.excluded" tag.', $id, $tagName));
+                throw new InvalidArgumentException(sprintf('The resource "%s" tagged "%s" is missing the "container.excluded" tag.', $id, self::TAG));
             }
 
             $class = $container->getParameterBag()->resolveValue($definition->getClass());
             if (! $class || $definition->isAbstract()) {
-                throw new InvalidArgumentException(sprintf('The resource "%s" tagged "%s" must have a class and not be abstract.', $id, $tagName));
+                throw new InvalidArgumentException(sprintf('The resource "%s" tagged "%s" must have a class and not be abstract.', $id, self::TAG));
             }
 
             if ($definition->getClass() !== $class) {
                 $definition->setClass($class);
             }
 
-            $tags[$id] = $definition->getTag($tagName);
+            $tags[$id] = $definition->getTag(self::TAG);
         }
 
         return $tags;

src/DependencyInjection/DoctrineExtension.php

@@ -12,6 +12,7 @@
 use Doctrine\Bundle\DoctrineBundle\ConnectionFactory;
 use Doctrine\Bundle\DoctrineBundle\Dbal\RegexSchemaAssetFilter;
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\IdGeneratorPass;
+use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\RegisterDbalTypePass;
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
 use Doctrine\Bundle\DoctrineBundle\Mapping\ContainerEntityListenerResolver;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepositoryInterface;
@@ -43,7 +44,6 @@
 use InvalidArgumentException;
 use LogicException;
 use ReflectionClass;
-use Reflector;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bridge\Doctrine\IdGenerator\UlidGenerator;
 use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
@@ -82,7 +82,6 @@
 use function interface_exists;
 use function is_dir;
 use function is_string;
-use function method_exists;
 use function realpath;
 use function reset;
 use function sprintf;
@@ -554,22 +553,7 @@ private function dbalLoad(array $config, ContainerBuilder $container): void
         }
 
         /** @phpstan-ignore argument.type (Needed for the $reflector parameter) */
-        $container->registerAttributeForAutoconfiguration(AsDatabaseType::class, static function (ChildDefinition $definition, AsDatabaseType $type, ReflectionClass $reflector): void {
-            $tag        = 'doctrine.dbal.type';
-            $attributes = [
-                'name' => $type->name ?? $reflector->name,
-            ];
-
-            // Determine if the version of symfony/dependency-injection is >= 7.3
-            /** @phpstan-ignore function.alreadyNarrowedType */
-            if (method_exists($definition, 'addResourceTag')) {
-                $definition->addResourceTag($tag, $attributes);
-            } else {
-                // Needed to keep compatibility with symfony/dependency-injection < 7.3
-                $definition->addTag('doctrine.dbal.type', $attributes)
-                    ->addTag('container.excluded', ['source' => sprintf('by tag "%s"', $tag)]);
-            }
-        });
+        $container->registerAttributeForAutoconfiguration(AsDatabaseType::class, RegisterDbalTypePass::autoconfigureFromAttribute(...));
 
         $container->registerForAutoconfiguration(MiddlewareInterface::class)->addTag('doctrine.middleware');