Merge branch '4.3' into 4.4

dunglas · dunglas · commit 42be5f81320e · 2019-10-29T11:04:46.000+01:00
* 4.3:
  [DoctrineBridge] Auto-validation must work if no regex are passed
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
@@ -175,7 +175,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/src/Symfony/Component/Validator/Tests/DependencyInjection/AddAutoMappingConfigurationPassTest.php b/src/Symfony/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'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp`
`175`	`175`	`public function regexpProvider()`
`176`	`176`	`{`
`177`	`177`	`return [`
`178`		`- [false, null],`
	`178`	`+ [true, null],`
`179`	`179`	`[true, '{^'.preg_quote(DoctrineLoaderEntity::class).'$\|^'.preg_quote(Entity::class).'$}'],`
`180`	`180`	`[false, '{^'.preg_quote(Entity::class).'$}'],`
`181`	`181`	`];`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(EntityManagerInterface $entityManager, string $class`
`43`	`43`	`public function loadClassMetadata(ClassMetadata $metadata): bool`
`44`	`44`	`{`
`45`	`45`	`$className = $metadata->getClassName();`
`46`		`- if (null === $this->classValidatorRegexp \|\| !preg_match($this->classValidatorRegexp, $className)) {`
	`46`	`+ if (null !== $this->classValidatorRegexp && !preg_match($this->classValidatorRegexp, $className)) {`
`47`	`47`	`return false;`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,6 @@ public function testDoNotMapAllClassesWhenConfigIsEmpty()`
`81`	`81`
`82`	`82`	`(new AddAutoMappingConfigurationPass())->process($container);`
`83`	`83`
`84`		`- $this->assertNull($container->getDefinition('loader')->getArgument('$classValidatorRegexp'));`
	`84`	`+ $this->assertFalse($container->hasDefinition('loader'));`
`85`	`85`	`}`
`86`	`86`	`}`