simplify callback logic

henry2778 · henry2778 · commit db37354287f7 · 2021-03-01T21:07:23.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/Unique.php b/src/Symfony/Component/Validator/Constraints/Unique.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\InvalidArgumentException;
 
 /**
  * @Annotation
@@ -29,20 +30,22 @@ class Unique extends Constraint
     ];
 
     public $message = 'This collection should contain only unique elements.';
-
-    /**
-     * @var string|callable
-     */
-    public $valueNormalizer;
+    public $normalizer;
 
     public function __construct(
         array $options = null,
         string $message = null,
+        callable $normalizer = null,
         array $groups = null,
         $payload = null
     ) {
         parent::__construct($options, $groups, $payload);
 
         $this->message = $message ?? $this->message;
+        $this->normalizer = $normalizer ?? $this->normalizer;
+
+        if (null !== $this->normalizer && !\is_callable($this->normalizer)) {
+            throw new InvalidArgumentException(sprintf('The "normalizer" option must be a valid callable ("%s" given).', get_debug_type($this->normalizer)));
+        }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -40,9 +39,9 @@ public function validate($value, Constraint $constraint)
         }
 
         $collectionElements = [];
-        $valueNormalizer = $this->getValueNormalizer($constraint);
+        $normalizer = $this->getNormalizer($constraint);
         foreach ($value as $element) {
-            $element = $valueNormalizer($element);
+            $element = $normalizer($element);
 
             if (\in_array($element, $collectionElements, true)) {
                 $this->context->buildViolation($constraint->message)
@@ -56,26 +55,14 @@ public function validate($value, Constraint $constraint)
         }
     }
 
-    private function getValueNormalizer(Unique $unique)
+    private function getNormalizer(Unique $unique): callable
     {
-        $normalizer = $unique->valueNormalizer;
-
-        if (null === $normalizer) {
+        if (null === $unique->normalizer) {
             return static function ($value) {
                 return $value;
             };
         }
 
-        if (\is_callable($normalizer)) {
-            return $normalizer;
-        }
-
-        if (\is_array($normalizer) && !\is_callable($normalizer) && isset($normalizer[0]) && \is_object($normalizer[0])) {
-            $normalizer[0] = \get_class($normalizer[0]);
-
-            return $normalizer;
-        }
-
-        throw new ConstraintDefinitionException(json_encode($normalizer).' in Unique constraint is not a valid callable.');
+        return $unique->normalizer;
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UniqueTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UniqueTest.php
@@ -35,6 +35,20 @@ public function testAttributes()
         self::assertSame(['my_group'], $cConstraint->groups);
         self::assertSame('some attached data', $cConstraint->payload);
     }
+
+    public function testInvalidNormalizerThrowsException()
+    {
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The "normalizer" option must be a valid callable ("string" given).');
+        new Unique(['normalizer' => 'Unknown Callable']);
+    }
+
+    public function testInvalidNormalizerObjectThrowsException()
+    {
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The "normalizer" option must be a valid callable ("stdClass" given).');
+        new Unique(['normalizer' => new \stdClass()]);
+    }
 }
 
 class UniqueDummy
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
@@ -127,7 +127,7 @@ public function testExpectsUniqueObjects($callback)
         $value = [$object1, $object2, $object3];
 
         $this->validator->validate($value, new Unique([
-            'valueNormalizer' => $callback,
+            'normalizer' => $callback,
         ]));
 
         $this->assertNoViolation();
@@ -154,7 +154,7 @@ public function testExpectsNonUniqueObjects($callback)
 
         $this->validator->validate($value, new Unique([
             'message' => 'myMessage',
-            'valueNormalizer' => $callback,
+            'normalizer' => $callback,
         ]));
 
         $this->buildViolation('myMessage')
@@ -183,7 +183,7 @@ public function testExpectsInvalidNonStrictComparison()
 
         $this->validator->validate([1, '1', 1.0, '1.0'], new Unique([
             'message' => 'myMessage',
-            'valueNormalizer' => $callback,
+            'normalizer' => $callback,
         ]));
 
         $this->buildViolation('myMessage')
@@ -199,7 +199,7 @@ public function testExpectsValidNonStrictComparison()
         };
 
         $this->validator->validate([1, '2', 3, '4.0'], new Unique([
-            'valueNormalizer' => $callback,
+            'normalizer' => $callback,
         ]));
 
         $this->assertNoViolation();
@@ -213,7 +213,7 @@ public function testExpectsInvalidCaseInsensitiveComparison()
 
         $this->validator->validate(['Hello', 'hello', 'HELLO', 'hellO'], new Unique([
             'message' => 'myMessage',
-            'valueNormalizer' => $callback,
+            'normalizer' => $callback,
         ]));
 
         $this->buildViolation('myMessage')
@@ -229,7 +229,7 @@ public function testExpectsValidCaseInsensitiveComparison()
         };
 
         $this->validator->validate(['Hello', 'World'], new Unique([
-            'valueNormalizer' => $callback,
+            'normalizer' => $callback,
         ]));
 
         $this->assertNoViolation();
