diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php index 7d494e6d0..69b99fb24 100644 --- a/DependencyInjection/DoctrineExtension.php +++ b/DependencyInjection/DoctrineExtension.php @@ -12,6 +12,7 @@ use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension; use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware; use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; +use Symfony\Bridge\Doctrine\Validator\DoctrineLoader; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ChildDefinition; @@ -348,6 +349,7 @@ protected function ormLoad(array $config, ContainerBuilder $container) $this->loadOrmEntityManager($entityManager, $container); $this->loadPropertyInfoExtractor($name, $container); + $this->loadValidatorLoader($name, $container); } if ($config['resolve_target_entities']) { @@ -760,6 +762,21 @@ private function loadPropertyInfoExtractor($entityManagerName, ContainerBuilder $propertyExtractorDefinition->addTag('property_info.type_extractor', ['priority' => -999]); } + /** + * Loads a validator loader for each defined entity manager. + */ + private function loadValidatorLoader(string $entityManagerName, ContainerBuilder $container) : void + { + if (!class_exists(DoctrineLoader::class)) { + return; + } + + $propertyExtractorDefinition = $container->register(sprintf('doctrine.orm.%s_entity_manager.validator_loader', $entityManagerName), DoctrineLoader::class); + $propertyExtractorDefinition->addArgument(new Reference(sprintf('doctrine.orm.%s_entity_manager', $entityManagerName))); + + $propertyExtractorDefinition->addTag('validator.auto_mapper', ['priority' => -100]); + } + /** * @param array $objectManager * @param string $cacheName diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php index 5b5a0340b..e39dc1566 100644 --- a/Tests/ContainerTest.php +++ b/Tests/ContainerTest.php @@ -19,6 +19,7 @@ use Symfony\Bridge\Doctrine\Logger\DbalLogger; use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator; +use Symfony\Bridge\Doctrine\Validator\DoctrineLoader; use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface; class ContainerTest extends TestCase @@ -68,5 +69,11 @@ public function testContainer() $this->assertInstanceOf(ClassMetadataFactory::classy, $container->get('doctrine.orm.default_entity_manager.metadata_factory')); } $this->assertInstanceOf(DoctrineExtractor::class, $container->get('doctrine.orm.default_entity_manager.property_info_extractor')); + + if (class_exists(DoctrineLoader::class)) { + $this->assertInstanceOf(DoctrineLoader::class, $container->get('doctrine.orm.default_entity_manager.validator_loader')); + } else { + $this->assertFalse($container->has('doctrine.orm.default_entity_manager.validator_loader')); + } } }