diff --git a/src/DependencyInjection/DoctrineExtension.php b/src/DependencyInjection/DoctrineExtension.php index 30cbfa6f..ea19d659 100644 --- a/src/DependencyInjection/DoctrineExtension.php +++ b/src/DependencyInjection/DoctrineExtension.php @@ -541,8 +541,10 @@ protected function ormLoad(array $config, ContainerBuilder $container) $controllerResolverDefaults['evict_cache'] = true; } + $valueResolverDefinition = $container->getDefinition('doctrine.orm.entity_value_resolver'); + if ($controllerResolverDefaults) { - $container->getDefinition('doctrine.orm.entity_value_resolver')->setArgument(2, (new Definition(MapEntity::class))->setArguments([ + $valueResolverDefinition->setArgument(2, (new Definition(MapEntity::class))->setArguments([ null, null, null, @@ -553,7 +555,12 @@ protected function ormLoad(array $config, ContainerBuilder $container) $controllerResolverDefaults['evict_cache'] ?? null, $controllerResolverDefaults['disabled'] ?? false, ])); + } else { + $valueResolverDefinition->setArgument(2, (new Definition(MapEntity::class))); } + + // Symfony 7.2 and higher expose type alias support in the EntityValueResolver + $valueResolverDefinition->setArgument(3, $config['resolve_target_entities']); } // not available in Doctrine ORM 3.0 and higher diff --git a/tests/ContainerTest.php b/tests/ContainerTest.php index 54a6b26b..e03154e8 100644 --- a/tests/ContainerTest.php +++ b/tests/ContainerTest.php @@ -15,6 +15,7 @@ use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand; use Doctrine\Persistence\ManagerRegistry; use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; +use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver; use Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer; use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector; use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; @@ -23,6 +24,7 @@ use Symfony\Component\Cache\Adapter\ArrayAdapter; use Symfony\Component\Cache\Adapter\PhpArrayAdapter; +use function class_exists; use function interface_exists; class ContainerTest extends TestCase @@ -39,6 +41,10 @@ public function testContainer(): void $this->assertInstanceOf(Reader::class, $container->get('doctrine.orm.metadata.annotation_reader')); } + if (class_exists(EntityValueResolver::class)) { + $this->assertInstanceOf(EntityValueResolver::class, $container->get('doctrine.orm.entity_value_resolver')); + } + $this->assertInstanceOf(DoctrineDataCollector::class, $container->get('data_collector.doctrine')); $this->assertInstanceOf(DBALConfiguration::class, $container->get('doctrine.dbal.default_connection.configuration')); $this->assertInstanceOf(EventManager::class, $container->get('doctrine.dbal.default_connection.event_manager')); diff --git a/tests/DependencyInjection/DoctrineExtensionTest.php b/tests/DependencyInjection/DoctrineExtensionTest.php index f1d2f005..4e1078a3 100644 --- a/tests/DependencyInjection/DoctrineExtensionTest.php +++ b/tests/DependencyInjection/DoctrineExtensionTest.php @@ -1497,13 +1497,19 @@ public function testControllerResolver(bool $simpleEntityManagerConfig): void $config['orm'] = []; } - $config['orm']['controller_resolver'] = ['auto_mapping' => true]; + $config['orm']['controller_resolver'] = ['auto_mapping' => true]; + $config['orm']['resolve_target_entities'] = ['Throwable' => 'stdClass']; $extension->load([$config], $container); $controllerResolver = $container->getDefinition('doctrine.orm.entity_value_resolver'); - $this->assertEquals([new Reference('doctrine'), new Reference('doctrine.orm.entity_value_resolver.expression_language', $container::IGNORE_ON_INVALID_REFERENCE)], $controllerResolver->getArguments()); + $this->assertEquals([ + 0 => new Reference('doctrine'), + 1 => new Reference('doctrine.orm.entity_value_resolver.expression_language', $container::IGNORE_ON_INVALID_REFERENCE), + 2 => new Definition(MapEntity::class), + 3 => ['Throwable' => 'stdClass'], + ], $controllerResolver->getArguments()); $container = $this->getContainer();