[Validator] UniqueValidator - normalize before reducing keys

Brajk19 · fabpot · commit 77df90b95907 · 2024-03-09T14:47:35.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -43,12 +43,12 @@ public function validate(mixed $value, Constraint $constraint)
         $collectionElements = [];
         $normalizer = $this->getNormalizer($constraint);
         foreach ($value as $element) {
+            $element = $normalizer($element);
+
             if ($fields && !$element = $this->reduceElementKeys($fields, $element)) {
                 continue;
             }
 
-            $element = $normalizer($element);
-
             if (\in_array($element, $collectionElements, true)) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+use Symfony\Component\Validator\Tests\Dummy\DummyClassOne;
 
 class UniqueValidatorTest extends ConstraintValidatorTestCase
 {
@@ -283,6 +284,36 @@ public static function getInvalidCollectionValues(): array
             ],
         ];
     }
+
+    public function testArrayOfObjectsUnique()
+    {
+        $array = [
+            new DummyClassOne(),
+            new DummyClassOne(),
+            new DummyClassOne(),
+        ];
+
+        $array[0]->code = '1';
+        $array[1]->code = '2';
+        $array[2]->code = '3';
+
+        $this->validator->validate(
+            $array,
+            new Unique(
+                normalizer: [self::class, 'normalizeDummyClassOne'],
+                fields: 'code'
+            )
+        );
+
+        $this->assertNoViolation();
+    }
+
+    public static function normalizeDummyClassOne(DummyClassOne $obj): array
+    {
+        return [
+            'code' => $obj->code,
+        ];
+    }
 }
 
 class CallableClass
