[DoctrineBridge] Auto-validation must work if no regex are passed

symfony · dunglas · Oct 29, 2019 · Oct 3, 2019 · Oct 29, 2019 · 5ed7d6c759c63e512532fcc4a37019f3b7dd12c4
commit 5ed7d6c759c63e512532fcc4a37019f3b7dd12c4
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
@@ -173,7 +173,7 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp
     public function regexpProvider()
     {
         return [
-            [false, null],
+            [true, null],
             [true, '{^'.preg_quote(DoctrineLoaderEntity::class).'$|^'.preg_quote(Entity::class).'$}'],
             [false, '{^'.preg_quote(Entity::class).'$}'],
         ];

diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
@@ -43,7 +43,7 @@ public function __construct(EntityManagerInterface $entityManager, string $class
     public function loadClassMetadata(ClassMetadata $metadata): bool
     {
         $className = $metadata->getClassName();
-        if (null === $this->classValidatorRegexp || !preg_match($this->classValidatorRegexp, $className)) {
+        if (null !== $this->classValidatorRegexp && !preg_match($this->classValidatorRegexp, $className)) {
             return false;
         }
 

diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
@@ -59,6 +59,10 @@ public function process(ContainerBuilder $container)
         $validatorBuilder = $container->getDefinition($this->validatorBuilderService);
         foreach ($container->findTaggedServiceIds($this->tag) as $id => $tags) {
             $regexp = $this->getRegexp(array_merge($globalNamespaces, $servicesToNamespaces[$id] ?? []));
+            if (null === $regexp) {
+                $container->removeDefinition($id);
+                continue;
+            }
 
             $container->getDefinition($id)->setArgument('$classValidatorRegexp', $regexp);
             $validatorBuilder->addMethodCall('addLoader', [new Reference($id)]);

diff --git a/...ony/Component/Validator/Tests/DependencyInjection/AddAutoMappingConfigurationPassTest.php b/...ony/Component/Validator/Tests/DependencyInjection/AddAutoMappingConfigurationPassTest.php
@@ -81,6 +81,6 @@ public function testDoNotMapAllClassesWhenConfigIsEmpty()
 
         (new AddAutoMappingConfigurationPass())->process($container);
 
-        $this->assertNull($container->getDefinition('loader')->getArgument('$classValidatorRegexp'));
+        $this->assertFalse($container->hasDefinition('loader'));
     }
 }