[Validator] Fix fields without constraints in Collection

HypeMC · HypeMC · commit f6217d87e66d · 2024-02-07T15:19:21.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php
@@ -94,20 +94,20 @@ private static function isFieldsOption($options): bool
             return false;
         }
 
-        if ([] === $options) {
-            return true;
-        }
-
         foreach ($options as $optionOrField) {
             if ($optionOrField instanceof Constraint) {
                 return true;
             }
 
+            if (null === $optionOrField) {
+                continue;
+            }
+
             if (!\is_array($optionOrField)) {
                 return false;
             }
 
-            if ([] !== $optionOrField && !($optionOrField[0] ?? null) instanceof Constraint) {
+            if ($optionOrField && !($optionOrField[0] ?? null) instanceof Constraint) {
                 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',

Original file line number	Diff line number	Diff line change
`@@ -94,20 +94,20 @@ private static function isFieldsOption($options): bool`
`94`	`94`	`return false;`
`95`	`95`	`}`
`96`	`96`
`97`		`- if ([] === $options) {`
`98`		`- return true;`
`99`		`- }`
`100`		`-`
`101`	`97`	`foreach ($options as $optionOrField) {`
`102`	`98`	`if ($optionOrField instanceof Constraint) {`
`103`	`99`	`return true;`
`104`	`100`	`}`
`105`	`101`
	`102`	`+ if (null === $optionOrField) {`
	`103`	`+ continue;`
	`104`	`+ }`
	`105`	`+`
`106`	`106`	`if (!\is_array($optionOrField)) {`
`107`	`107`	`return false;`
`108`	`108`	`}`
`109`	`109`
`110`		`- if ([] !== $optionOrField && !($optionOrField[0] ?? null) instanceof Constraint) {`
	`110`	`+ if ($optionOrField && !($optionOrField[0] ?? null) instanceof Constraint) {`
`111`	`111`	`return false;`
`112`	`112`	`}`
`113`	`113`	`}`