[Validator] Allow opt-out of EmailValidator deprecation when using Validation::createValidatorBuilder()

nicolas-grekas · nicolas-grekas · commit bb7ea3cb0643 · 2022-12-14T15:07:07.000+01:00
diff --git a/src/Symfony/Component/Validator/ConstraintValidatorFactory.php b/src/Symfony/Component/Validator/ConstraintValidatorFactory.php
@@ -26,20 +26,17 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
 {
     protected $validators = [];
 
-    public function __construct()
+    public function __construct(array $validators = [])
     {
+        $this->validators = $validators;
     }
 
     public function getInstance(Constraint $constraint): ConstraintValidatorInterface
     {
-        $className = $constraint->validatedBy();
-
-        if (!isset($this->validators[$className])) {
-            $this->validators[$className] = 'validator.expression' === $className
-                ? new ExpressionValidator()
-                : new $className();
+        if ('validator.expression' === $name = $class = $constraint->validatedBy()) {
+            $class = ExpressionValidator::class;
         }
 
-        return $this->validators[$className];
+        return $this->validators[$name] ??= new $class();
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintValidatorFactoryTest.php b/src/Symfony/Component/Validator/Tests/ConstraintValidatorFactoryTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\ConstraintValidatorFactory;
+use Symfony\Component\Validator\Tests\Fixtures\DummyConstraint;
+use Symfony\Component\Validator\Tests\Fixtures\DummyConstraintValidator;
+
+class ConstraintValidatorFactoryTest extends TestCase
+{
+    public function testGetInstance()
+    {
+        $factory = new ConstraintValidatorFactory();
+        $this->assertInstanceOf(DummyConstraintValidator::class, $factory->getInstance(new DummyConstraint()));
+    }
+
+    public function testPredefinedGetInstance()
+    {
+        $validator = new DummyConstraintValidator();
+        $factory = new ConstraintValidatorFactory([DummyConstraintValidator::class => $validator]);
+        $this->assertSame($validator, $factory->getInstance(new DummyConstraint()));
+    }
+}
diff --git a/src/Symfony/Component/Validator/Tests/ContainerConstraintValidatorFactoryTest.php b/src/Symfony/Component/Validator/Tests/ContainerConstraintValidatorFactoryTest.php
@@ -15,9 +15,10 @@
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\Blank as BlankConstraint;
-use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\ContainerConstraintValidatorFactory;
 use Symfony\Component\Validator\Exception\ValidatorException;
+use Symfony\Component\Validator\Tests\Fixtures\DummyConstraint;
+use Symfony\Component\Validator\Tests\Fixtures\DummyConstraintValidator;
 
 class ContainerConstraintValidatorFactoryTest extends TestCase
 {
@@ -59,18 +60,3 @@ public function testGetInstanceInvalidValidatorClass()
         $factory->getInstance($constraint);
     }
 }
-
-class DummyConstraint extends Constraint
-{
-    public function validatedBy(): string
-    {
-        return DummyConstraintValidator::class;
-    }
-}
-
-class DummyConstraintValidator extends ConstraintValidator
-{
-    public function validate($value, Constraint $constraint)
-    {
-    }
-}
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraint.php b/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraint.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+use Symfony\Component\Validator\Constraint;
+
+class DummyConstraint extends Constraint
+{
+    public function validatedBy(): string
+    {
+        return DummyConstraintValidator::class;
+    }
+}
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraintValidator.php b/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraintValidator.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+class DummyConstraintValidator extends ConstraintValidator
+{
+    public function validate($value, Constraint $constraint)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -26,20 +26,17 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface`
`26`	`26`	`{`
`27`	`27`	`protected $validators = [];`
`28`	`28`
`29`		`- public function __construct()`
	`29`	`+ public function __construct(array $validators = [])`
`30`	`30`	`{`
	`31`	`+ $this->validators = $validators;`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public function getInstance(Constraint $constraint): ConstraintValidatorInterface`
`34`	`35`	`{`
`35`		`- $className = $constraint->validatedBy();`
`36`		`-`
`37`		`- if (!isset($this->validators[$className])) {`
`38`		`- $this->validators[$className] = 'validator.expression' === $className`
`39`		`- ? new ExpressionValidator()`
`40`		`- : new $className();`
	`36`	`+ if ('validator.expression' === $name = $class = $constraint->validatedBy()) {`
	`37`	`+ $class = ExpressionValidator::class;`
`41`	`38`	`}`
`42`	`39`
`43`		`- return $this->validators[$className];`
	`40`	`+ return $this->validators[$name] ??= new $class();`
`44`	`41`	`}`
`45`	`42`	`}`