Add support for validator automapping

doctrine · Apr 6, 2019 · 75c249b · 75c249b
1 parent c88b987
commit 75c249b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git 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;
@@ -22,6 +23,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory;
+use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
 
 /**
  * DoctrineExtension is an extension for the Doctrine DBAL and ORM library.
@@ -350,6 +352,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']) {
@@ -756,6 +759,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 (! interface_exists(LoaderInterface::class) || ! class_exists(DoctrineLoader::class)) {
+            return;
+        }
+
+        $validatorLoaderDefinition = $container->register(sprintf('doctrine.orm.%s_entity_manager.validator_loader', $entityManagerName), DoctrineLoader::class);
+        $validatorLoaderDefinition->addArgument(new Reference(sprintf('doctrine.orm.%s_entity_manager', $entityManagerName)));
+
+        $validatorLoaderDefinition->addTag('validator.auto_mapper', ['priority' => -100]);
+    }
+
     /**
      * @param array  $objectManager
      * @param string $cacheName

diff --git 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::class, $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'));
+        }
     }
 }