Merge preserving keys only one level deep (laravel#51516)

bert-w · May 30, 2024 · 83e28d0 · 83e28d0
1 parent 5611359
commit 83e28d0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1205,9 +1205,9 @@ public function addRules($rules)
         $response = (new ValidationRuleParser($this->data))
                             ->explode(ValidationRuleParser::filterConditionalRules($rules, $this->data));
 
-        $this->rules = array_merge_recursive(
-            $this->rules, $response->rules
-        );
+        foreach ($response->rules as $key => $rule) {
+            $this->rules[$key] = array_merge($this->rules[$key] ?? [], $rule);
+        }
 
         $this->implicitAttributes = array_merge(
             $this->implicitAttributes, $response->implicitAttributes

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -5090,6 +5090,29 @@ public function testAlternativeFormat()
         $this->assertTrue($v->passes());
     }
 
+    public function testNumericKeys()
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, ['3' => 'aslsdlks'], [3 => 'required']);
+        $this->assertTrue($v->passes());
+    }
+
+    public function testMergeRules()
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, ['x' => 'asl', 'a' => [1, 4]], ['x' => ['alpha', ['min', 3]], 'a.*' => 'integer']);
+        $v->addRules(['x' => ['required', ['max', 10]], 'a.1' => 'digits:1']);
+        $this->assertEquals(
+            [
+                'x' => ['alpha', ['min', 3], 'required', ['max', 10]],
+                'a.0' => ['integer'],
+                'a.1' => ['integer', 'digits:1'],
+            ],
+            $v->getRules()
+        );
+        $this->assertTrue($v->passes());
+    }
+
     public function testValidateAlpha()
     {
         $trans = $this->getIlluminateArrayTranslator();