Register the Validator auto-mapping loader

doctrine · Jul 3, 2018 · 5d8536e · 5d8536e
1 parent 217eaab
commit 5d8536e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -9,6 +9,7 @@
 use Doctrine\ORM\Version;
 use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
 use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
+use Symfony\Bridge\Doctrine\Validator\DoctrineLoader;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ChildDefinition;
@@ -352,15 +353,31 @@ protected function ormLoad(array $config, ContainerBuilder $container)
         $loadPropertyInfoExtractor = interface_exists('Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface')
             && class_exists('Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor');
 
+        $loadValidatorAutoMappingLoader = class_exists(DoctrineLoader::class);
+
         foreach ($config['entity_managers'] as $name => $entityManager) {
             $entityManager['name'] = $name;
             $this->loadOrmEntityManager($entityManager, $container);
 
-            if (! $loadPropertyInfoExtractor) {
+            if (!$loadPropertyInfoExtractor && !$loadValidatorAutoMappingLoader) {
                 continue;
             }
 
-            $this->loadPropertyInfoExtractor($name, $container);
+            $metadataFactoryService = sprintf('doctrine.orm.%s_entity_manager.metadata_factory', $name);
+            $metadataFactoryDefinition = $container->register($metadataFactoryService, 'Doctrine\Common\Persistence\Mapping\ClassMetadataFactory');
+            $metadataFactoryDefinition->setFactory([
+                new Reference(sprintf('doctrine.orm.%s_entity_manager', $name)),
+                'getMetadataFactory',
+            ]);
+            $metadataFactoryDefinition->setPublic(false);
+
+            if ($loadPropertyInfoExtractor) {
+                $this->loadPropertyInfoExtractor($name, $container, $metadataFactoryService);
+            }
+
+            if ($loadValidatorAutoMappingLoader) {
+                $this->loadValidatorAutoMappingLoader($name, $container, $metadataFactoryService);
+            }
         }
 
         if ($config['resolve_target_entities']) {
@@ -785,23 +802,27 @@ protected function loadOrmCacheDrivers(array $entityManager, ContainerBuilder $c
      * Loads a property info extractor for each defined entity manager.
      *
      * @param string $entityManagerName
+     * @param string $metadataFactoryService
      */
-    private function loadPropertyInfoExtractor($entityManagerName, ContainerBuilder $container)
+    private function loadPropertyInfoExtractor($entityManagerName, ContainerBuilder $container, $metadataFactoryService)
     {
-        $metadataFactoryService = sprintf('doctrine.orm.%s_entity_manager.metadata_factory', $entityManagerName);
-
-        $metadataFactoryDefinition = $container->register($metadataFactoryService, 'Doctrine\Common\Persistence\Mapping\ClassMetadataFactory');
-        $metadataFactoryDefinition->setFactory([
-            new Reference(sprintf('doctrine.orm.%s_entity_manager', $entityManagerName)),
-            'getMetadataFactory',
-        ]);
-        $metadataFactoryDefinition->setPublic(false);
-
         $propertyExtractorDefinition = $container->register(sprintf('doctrine.orm.%s_entity_manager.property_info_extractor', $entityManagerName), 'Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor');
         $propertyExtractorDefinition->addArgument(new Reference($metadataFactoryService));
         $propertyExtractorDefinition->addTag('property_info.list_extractor', ['priority' => -1001]);
         $propertyExtractorDefinition->addTag('property_info.type_extractor', ['priority' => -999]);
     }
+    /**
+     * Loads a validator loader for each defined entity manager.
+     *
+     * @param string $entityManagerName
+     * @param string $metadataFactoryService
+     */
+    private function loadValidatorAutoMappingLoader($entityManagerName, ContainerBuilder $container, $metadataFactoryService)
+    {
+        $validatorLoaderDefinition = $container->register(sprintf('doctrine.orm.%s_entity_manager.validator_loader', $entityManagerName), DoctrineLoader::class);
+        $validatorLoaderDefinition->addArgument(new Reference($metadataFactoryService));
+        $validatorLoaderDefinition->addTag('validator.auto_mapping');
+    }
 
     /**
      * @param array  $objectManager

diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php
@@ -3,6 +3,7 @@
 namespace Doctrine\Bundle\DoctrineBundle\Tests;
 
 use Doctrine\DBAL\Types\Type;
+use Symfony\Bridge\Doctrine\Validator\DoctrineLoader;
 
 class ContainerTest extends TestCase
 {
@@ -54,5 +55,11 @@ public function testContainer()
             $this->assertFalse($container->has('doctrine.orm.default_entity_manager.metadata_factory'));
             $this->assertFalse($container->has('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'));
+        }
     }
 }