Skip to content

Commit ef4f3c2

Browse files
committed
use service Id as type name
1 parent 8079ea7 commit ef4f3c2

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/DependencyInjection/Compiler/RegisterDbalTypePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function process(ContainerBuilder $container): void
5858
throw new InvalidArgumentException(sprintf('The "%s" class must extends "%s".', $class, Type::class));
5959
}
6060

61-
$types[$tag['type_name'] ?? $class] = ['class' => $class];
61+
$types[$tag['type_name'] ?? $id] = ['class' => $class];
6262
}
6363
}
6464

tests/DependencyInjection/Compiler/RegisterDbalTypePassTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,21 @@ public function testTaggedTypeAreAdded(): void
3131
self::assertSame(['bar' => ['class' => BarType::class]], $container->getParameter('doctrine.dbal.connection_factory.types'));
3232
}
3333

34-
public function testUseClassnameAsTypeNameIfNotDefined(): void
34+
public function testServiceIdMustBeUsedAsTypeNameIfNotDefined(): void
3535
{
3636
$container = new ContainerBuilder();
3737
$container->addCompilerPass(new RegisterDbalTypePass());
3838

3939
$container->setParameter('doctrine.dbal.connection_factory.types', []);
4040

41-
$container->register(BarType::class)
41+
$container->register('doctrine.dbal.type.bar')
42+
->setClass(BarType::class)
4243
->addTag('doctrine.dbal.type')
4344
->addTag('container.excluded');
4445

4546
$container->compile();
4647

47-
self::assertSame([BarType::class => ['class' => BarType::class]], $container->getParameter('doctrine.dbal.connection_factory.types'));
48+
self::assertSame(['doctrine.dbal.type.bar' => ['class' => BarType::class]], $container->getParameter('doctrine.dbal.connection_factory.types'));
4849
}
4950

5051
public function testTypeMustBeASubclassOfTheDbalBaseType(): void

0 commit comments

Comments
 (0)