[Validator] Fix fields without constraints in Collection

symfony · Feb 4, 2024 · 9de3680 · 9de3680
1 parent 89b3d63
commit 9de3680
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php
@@ -103,6 +103,10 @@ private static function isFieldsOption($options): bool
                 return true;
             }
 
+            if (null === $optionOrField) {
+                return true;
+            }
+
             if (!\is_array($optionOrField)) {
                 return false;
             }

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
@@ -175,10 +175,15 @@ public function testEmptyFieldsInOptions()
         $this->assertSame('foo bar baz', $constraint->extraFieldsMessage);
     }
 
-    public function testEmptyConstraintListFor()
+    /**
+     * @testWith [[]]
+     *           [null]
+     */
+    public function testEmptyConstraintListForField(?array $fieldConstraint)
     {
-        $constraint = new Collection([
-                'foo' => [],
+        $constraint = new Collection(
+            [
+                'foo' => $fieldConstraint,
             ],
             null,
             null,
@@ -193,11 +198,15 @@ public function testEmptyConstraintListFor()
         $this->assertSame('foo bar baz', $constraint->extraFieldsMessage);
     }
 
-    public function testEmptyConstraintListForFieldInOptions()
+    /**
+     * @testWith [[]]
+     *           [null]
+     */
+    public function testEmptyConstraintListForFieldInOptions(?array $fieldConstraint)
     {
         $constraint = new Collection([
             'fields' => [
-                'foo' => [],
+                'foo' => $fieldConstraint,
             ],
             'allowExtraFields' => true,
             'extraFieldsMessage' => 'foo bar baz',