[9.x] Patch nested array validation rule regression bug (#43897)

* Remove Arr::flatten

* Update tests and remove no-longer relevant tests

* Add test for nested validation rules

* Rename and move test

* Add failing validation run

* CS fix

Author: stevebauman

src/Illuminate/Validation/ValidationRuleParser.php

@@ -151,7 +151,7 @@ protected function explodeWildcardRules($results, $attribute, $rules)
 
         foreach ($data as $key => $value) {
             if (Str::startsWith($key, $attribute) || (bool) preg_match('/^'.$pattern.'\z/', $key)) {
-                foreach (Arr::flatten((array) $rules) as $rule) {
+                foreach ((array) $rules as $rule) {
                     if ($rule instanceof NestedRules) {
                         $compiled = $rule->compile($key, $value, $data);
 

tests/Validation/ValidationRuleParserTest.php

@@ -144,18 +144,6 @@ public function testExplodeFailsParsingRegexWithOtherRulesInSingleString()
         $this->assertSame('bar)$/i', $exploded->rules['items.0.type'][2]);
     }
 
-    public function testExplodeProperlyFlattensRuleArraysOfArrays()
-    {
-        $data = ['items' => [['type' => 'foo']]];
-
-        $exploded = (new ValidationRuleParser($data))->explode(
-            ['items.*.type' => ['in:foo', [[['regex:/^(foo|bar)$/i']]]]]
-        );
-
-        $this->assertSame('in:foo', $exploded->rules['items.0.type'][0]);
-        $this->assertSame('regex:/^(foo|bar)$/i', $exploded->rules['items.0.type'][1]);
-    }
-
     public function testExplodeGeneratesNestedRules()
     {
         $parser = (new ValidationRuleParser([
@@ -208,28 +196,19 @@ public function testExplodeHandlesArraysOfNestedRules()
         ]));
 
         $results = $parser->explode([
-            'users.*.name' => [
-                Rule::forEach(function ($value, $attribute, $data) {
-                    $this->assertEquals([
-                        'users.0.name' => 'Taylor Otwell',
-                        'users.1.name' => 'Abigail Otwell',
-                    ], $data);
-
-                    return [Rule::requiredIf(true)];
-                }),
-                Rule::forEach(function ($value, $attribute, $data) {
+            'users.*.name' => Rule::forEach(function ($value, $attribute, $data) {
                     $this->assertEquals([
                         'users.0.name' => 'Taylor Otwell',
                         'users.1.name' => 'Abigail Otwell',
                     ], $data);
 
                     return [
+                        Rule::requiredIf(true),
                         $value === 'Taylor Otwell'
                             ? Rule::in('taylor')
                             : Rule::in('abigail'),
                     ];
                 }),
-            ],
         ]);
 
         $this->assertEquals([
@@ -240,8 +219,6 @@ public function testExplodeHandlesArraysOfNestedRules()
         $this->assertEquals([
             'users.*.name' => [
                 'users.0.name',
-                'users.0.name',
-                'users.1.name',
                 'users.1.name',
             ],
         ], $results->implicitAttributes);
@@ -254,9 +231,13 @@ public function testExplodeHandlesRecursivelyNestedRules()
         ]));
 
         $results = $parser->explode([
-            'users.*.name' => [
-                Rule::forEach(function ($value, $attribute, $data) {
-                    $this->assertSame('Taylor Otwell', $value);
+            'users.*.name' => Rule::forEach(function ($value, $attribute, $data) {
+                $this->assertSame('Taylor Otwell', $value);
+                $this->assertSame('users.0.name', $attribute);
+                $this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);
+
+                return Rule::forEach(function ($value, $attribute, $data) {
+                    $this->assertNull($value);
                     $this->assertSame('users.0.name', $attribute);
                     $this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);
 
@@ -265,16 +246,10 @@ public function testExplodeHandlesRecursivelyNestedRules()
                         $this->assertSame('users.0.name', $attribute);
                         $this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);
 
-                        return Rule::forEach(function ($value, $attribute, $data) {
-                            $this->assertNull($value);
-                            $this->assertSame('users.0.name', $attribute);
-                            $this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);
-
-                            return [Rule::requiredIf(true)];
-                        });
+                        return [Rule::requiredIf(true)];
                     });
-                }),
-            ],
+                });
+            }),
         ]);
 
         $this->assertEquals(['users.0.name' => ['required']], $results->rules);

tests/Validation/ValidationValidatorTest.php

@@ -173,6 +173,37 @@ public function testInValidatableRulesReturnsValid()
         $this->assertTrue($v->passes());
     }
 
+    public function testValidateUsingNestedValidationRulesPasses()
+    {
+        $rules = [
+            'items' => ['array'],
+            'items.*' => ['array', ['required_array_keys', '|name']],
+            'items.*.|name' => [['in', '|ABC123']],
+        ];
+
+        $data = [
+            'items' => [
+                ['|name' => '|ABC123'],
+            ],
+        ];
+
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, $data, $rules);
+
+        $this->assertTrue($v->passes());
+
+        $data = [
+            'items' => [
+                ['|name' => '|1234'],
+            ],
+        ];
+
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, $data, $rules);
+
+        $this->assertSame('validation.in', $v->messages()->get('items.0.|name')[0]);
+    }
+
     public function testValidateEmptyStringsAlwaysPasses()
     {
         $trans = $this->getIlluminateArrayTranslator();