make attribute name optional

Author: syl20b

docs/en/dbal-type.rst

@@ -3,7 +3,7 @@ DBAL Types
 
 Custom DBAL types can be registered using the ``AsDatabaseType`` attribute. This
 attribute allows you to define a name for your custom type directly in the class
-definition.
+definition. If the name is not provided, the class name will be used as the default.
 
 To register a custom DBAL type, create a class that extends
 ``Doctrine\DBAL\Types\Type`` and add the ``#[AsDatabaseType]`` attribute to it:

src/Attribute/AsDatabaseType.php

@@ -9,7 +9,7 @@
 #[Attribute(Attribute::TARGET_CLASS)]
 final readonly class AsDatabaseType
 {
-    public function __construct(public string $name)
+    public function __construct(public string|null $name = null)
     {
     }
 }

src/DependencyInjection/DoctrineExtension.php

@@ -44,6 +44,7 @@
 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;
@@ -552,10 +553,11 @@ private function dbalLoad(array $config, ContainerBuilder $container): void
             $this->loadDbalConnection($name, $connection, $container);
         }
 
-        $container->registerAttributeForAutoconfiguration(AsDatabaseType::class, static function (ChildDefinition $definition, AsDatabaseType $type): void {
+        $container->registerAttributeForAutoconfiguration(AsDatabaseType::class, static function (ChildDefinition $definition, AsDatabaseType $type, Reflector $reflector): void {
+            assert($reflector instanceof ReflectionClass);
             $tag        = 'doctrine.dbal.type';
             $attributes = [
-                'name' => $type->name,
+                'name' => $type->name ?? $reflector->name,
             ];
 
             // Determine if the version of symfony/dependency-injection is >= 7.3

tests/DependencyInjection/DoctrineExtensionTest.php

@@ -12,6 +12,7 @@
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
 use Doctrine\Bundle\DoctrineBundle\Tests\Builder\BundleConfigurationBuilder;
 use Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\Fixtures\DbalType;
+use Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\Fixtures\DbalTypeNoName;
 use Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\Fixtures\Php8EntityListener;
 use Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\Fixtures\Php8EventListener;
 use Doctrine\DBAL\Connection;
@@ -949,7 +950,8 @@ public static function cacheConfigurationProvider(): array
         ];
     }
 
-    public function testAsDatabaseTypeAttribute(): void
+    #[DataProvider('provideDatabaseTypeAttribute')]
+    public function testAsDatabaseTypeAttribute(string $typeClassname, string $expectedName): void
     {
         $container = $this->getContainer();
         $extension = new DoctrineExtension();
@@ -967,17 +969,27 @@ public function testAsDatabaseTypeAttribute(): void
             : $container->getAutoconfiguredAttributes();
         $this->assertInstanceOf(Closure::class, $attributes[AsDatabaseType::class]);
 
-        $reflector  = new ReflectionClass(DbalType::class);
+        /** @var class-string $typeClassname */
+        $reflector  = new ReflectionClass($typeClassname);
         $definition = new ChildDefinition('');
         $attribute  = $reflector->getAttributes(AsDatabaseType::class)[0]->newInstance();
 
-        $attributes[AsDatabaseType::class]($definition, $attribute);
+        $attributes[AsDatabaseType::class]($definition, $attribute, $reflector);
 
-        $expected = ['name' => 'dbal_type'];
+        $expected = ['name' => $expectedName];
         $this->assertSame([$expected], $definition->getTag('doctrine.dbal.type'));
         $this->assertSame([['source' => 'by tag "doctrine.dbal.type"']], $definition->getTag('container.excluded'));
     }
 
+    /** @return array<array{0: class-string, 1: string}> */
+    public static function provideDatabaseTypeAttribute(): array
+    {
+        return [
+            'with name' => [DbalType::class, 'dbal_type'],
+            'without name' => [DbalTypeNoName::class, DbalTypeNoName::class],
+        ];
+    }
+
     /** @return array<array{0: class-string}> */
     public static function provideAttributeExcludedFromContainer(): array
     {

tests/DependencyInjection/Fixtures/DbalTypeNoName.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\Fixtures;
+
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsDatabaseType;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+#[AsDatabaseType]
+class DbalTypeNoName extends Type
+{
+    /** @param array<string, mixed> $column */
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+    {
+        return 'dbal_type_no_name';
+    }
+}