[Validator] Fix type error for non-array items when Unique::fields is set

aprat84 · aprat84 · commit f7158bd00fc4 · 2023-11-27T10:55:31.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -43,7 +43,7 @@ public function validate(mixed $value, Constraint $constraint)
         $collectionElements = [];
         $normalizer = $this->getNormalizer($constraint);
         foreach ($value as $element) {
-            if ($fields && !$element = $this->reduceElementKeys($fields, $element)) {
+            if ($fields && !(\is_array($element) && $element = $this->reduceElementKeys($fields, $element))) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
@@ -242,6 +242,30 @@ public static function getInvalidFieldNames(): array
         ];
     }
 
+    /**
+     * @dataProvider getValidCollectionValues
+     */
+    public function testValidCollectionValues(array $value, array $fields)
+    {
+        $this->validator->validate($value, new Unique(fields: $fields));
+
+        $this->assertNoViolation();
+    }
+
+    public static function getValidCollectionValues(): array
+    {
+        return [
+            'unique empty item' => [
+                [['field' => 1], ['field' => 2], []],
+                ['field'],
+            ],
+            'unique non-array item' => [
+                [['field' => 1], ['field' => 2], '', 1, null],
+                ['field'],
+            ],
+        ];
+    }
+
     /**
      * @dataProvider getInvalidCollectionValues
      */

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function validate(mixed $value, Constraint $constraint)`
`43`	`43`	`$collectionElements = [];`
`44`	`44`	`$normalizer = $this->getNormalizer($constraint);`
`45`	`45`	`foreach ($value as $element) {`
`46`		`- if ($fields && !$element = $this->reduceElementKeys($fields, $element)) {`
	`46`	`+ if ($fields && !(\is_array($element) && $element = $this->reduceElementKeys($fields, $element))) {`
`47`	`47`	`continue;`
`48`	`48`	`}`
`49`	`49`