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

dunglas · dunglas · commit 5612e7d0c04c · 2019-10-03T11:47:46.000+02:00
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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp`
`173`	`173`	`public function regexpProvider()`
`174`	`174`	`{`
`175`	`175`	`return [`
`176`		`- [false, null],`
	`176`	`+ [true, null],`
`177`	`177`	`[true, '{^'.preg_quote(DoctrineLoaderEntity::class).'$\|^'.preg_quote(Entity::class).'$}'],`
`178`	`178`	`[false, '{^'.preg_quote(Entity::class).'$}'],`
`179`	`179`	`];`
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`