[10.x] Support ConditionalRules within NestedRules (#47344)

* failing test * filter conditional rules when compiling NestedRules * styleci * always filter conditional rules * modify test * split tests
laravel · Jun 7, 2023 · 0307ae4 · 0307ae4
1 parent d06f3a9
commit 0307ae4
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/NestedRules.php b/src/Illuminate/Validation/NestedRules.php
@@ -47,9 +47,11 @@ public function compile($attribute, $value, $data = null)
                 $nested[$attribute.'.'.$key] = $rule;
             }
 
-            return $parser->explode($nested);
+            $rules = $nested;
+        } else {
+            $rules = [$attribute => $rules];
         }
 
-        return $parser->explode([$attribute => $rules]);
+        return $parser->explode(ValidationRuleParser::filterConditionalRules($rules, $data));
     }
 }
diff --git a/tests/Validation/ValidationForEachTest.php b/tests/Validation/ValidationForEachTest.php
@@ -257,6 +257,70 @@ public function testForEachCallbacksCanContainMultipleRegexRules()
         ], $v->getMessageBag()->toArray());
     }
 
+    public function testConditionalRulesCanBeAddedToForEachWithAssociativeArray()
+    {
+        $v = new Validator(
+            $this->getIlluminateArrayTranslator(),
+            [
+                'foo' => [
+                    ['bar' => true],
+                    ['bar' => false],
+                ],
+            ],
+            [
+                'foo.*' => Rule::forEach(fn(mixed $value, string $attribute) => [
+                    'bar' => Rule::when(true, ['accepted'], ['declined']),
+                ]),
+            ]
+        );
+
+        $this->assertEquals([
+            'foo.1.bar' => ['validation.accepted'],
+        ], $v->getMessageBag()->toArray());
+    }
+    public function testConditionalRulesCanBeAddedToForEachWithList()
+    {
+        $v = new Validator(
+            $this->getIlluminateArrayTranslator(),
+            [
+                'foo' => [
+                    ['bar' => true],
+                    ['bar' => false],
+                ],
+            ],
+            [
+                'foo.*.bar' => Rule::forEach(fn(mixed $value, string $attribute) => [
+                    Rule::when(true, ['accepted'], ['declined']),
+                ]),
+            ]);
+
+        $this->assertEquals([
+            'foo.1.bar' => ['validation.accepted'],
+        ], $v->getMessageBag()->toArray());
+
+    }
+
+    public function testConditionalRulesCanBeAddedToForEachWithObject()
+    {
+        $v = new Validator(
+            $this->getIlluminateArrayTranslator(),
+            [
+                'foo' => [
+                    ['bar' => true],
+                    ['bar' => false],
+                ],
+            ],
+            [
+            'foo.*.bar' => Rule::forEach(fn (mixed $value, string $attribute) =>
+                Rule::when(true, ['accepted'], ['declined']),
+            ),
+        ]);
+
+        $this->assertEquals([
+            'foo.1.bar' => ['validation.accepted'],
+        ], $v->getMessageBag()->toArray());
+    }
+
     protected function getTranslator()
     {
         return m::mock(TranslatorContract::class);