Fix wrong handling of null values when Unique::fields is set

symfony · Jan 9, 2023 · 2b652bd · 2b652bd
1 parent 0f38c5a
commit 2b652bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Constraints/UniqueValidator.php b/Constraints/UniqueValidator.php
@@ -79,7 +79,7 @@ private function reduceElementKeys(array $fields, array $element): array
             if (!\is_string($field)) {
                 throw new UnexpectedTypeException($field, 'string');
             }
-            if (isset($element[$field])) {
+            if (\array_key_exists($field, $element)) {
                 $output[$field] = $element[$field];
             }
         }

diff --git a/Tests/Constraints/UniqueValidatorTest.php b/Tests/Constraints/UniqueValidatorTest.php
@@ -280,6 +280,14 @@ public function getInvalidCollectionValues(): array
                 ['id' => 1, 'email' => '[email protected]'],
                 ['id' => 1, 'email' => '[email protected]'],
             ], ['id']],
+            'unique null' => [
+                [null, null],
+                [],
+            ],
+            'unique field null' => [
+                [['nullField' => null], ['nullField' => null]],
+                ['nullField'],
+            ],
         ];
     }
 }