Merge pull request #6241 from kenjis/fix-validation-setRule-errors

fix:  custom validation error is cleared when calling setRule() twice

Author: kenjis

system/Validation/Validation.php

@@ -399,7 +399,7 @@ public function setRule(string $field, ?string $label, $rules, array $errors = [
             $ruleSet[$field]['errors'] = $errors;
         }
 
-        $this->setRules($ruleSet + $this->getRules());
+        $this->setRules($ruleSet + $this->getRules(), $this->customErrors);
 
         return $this;
     }

tests/system/Validation/StrictRules/ValidationTest.php

@@ -202,17 +202,50 @@ public function testRunReturnsLocalizedErrors(): void
 
     public function testRunWithCustomErrors(): void
     {
-        $data = ['foo' => 'notanumber'];
-
+        $data = [
+            'foo' => 'notanumber',
+            'bar' => 'notanumber',
+        ];
         $messages = [
             'foo' => [
                 'is_numeric' => 'Nope. Not a number.',
             ],
+            'bar' => [
+                'is_numeric' => 'No. Not a number.',
+            ],
         ];
+        $this->validation->setRules(['foo' => 'is_numeric', 'bar' => 'is_numeric'], $messages);
+        $this->validation->run($data);
+
+        $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
+        $this->assertSame('No. Not a number.', $this->validation->getError('bar'));
+    }
 
-        $this->validation->setRules(['foo' => 'is_numeric'], $messages);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/6239
+     */
+    public function testSetRuleWithCustomErrors(): void
+    {
+        $data = [
+            'foo' => 'notanumber',
+            'bar' => 'notanumber',
+        ];
+        $this->validation->setRule(
+            'foo',
+            'Foo',
+            ['foo'        => 'is_numeric'],
+            ['is_numeric' => 'Nope. Not a number.']
+        );
+        $this->validation->setRule(
+            'bar',
+            'Bar',
+            ['bar'        => 'is_numeric'],
+            ['is_numeric' => 'Nope. Not a number.']
+        );
         $this->validation->run($data);
+
         $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
+        $this->assertSame('Nope. Not a number.', $this->validation->getError('bar'));
     }
 
     public function testCheck(): void

tests/system/Validation/ValidationTest.php

@@ -305,17 +305,50 @@ public function testRunReturnsLocalizedErrors(): void
 
     public function testRunWithCustomErrors(): void
     {
-        $data = ['foo' => 'notanumber'];
-
+        $data = [
+            'foo' => 'notanumber',
+            'bar' => 'notanumber',
+        ];
         $messages = [
             'foo' => [
                 'is_numeric' => 'Nope. Not a number.',
             ],
+            'bar' => [
+                'is_numeric' => 'No. Not a number.',
+            ],
         ];
+        $this->validation->setRules(['foo' => 'is_numeric', 'bar' => 'is_numeric'], $messages);
+        $this->validation->run($data);
+
+        $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
+        $this->assertSame('No. Not a number.', $this->validation->getError('bar'));
+    }
 
-        $this->validation->setRules(['foo' => 'is_numeric'], $messages);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/6239
+     */
+    public function testSetRuleWithCustomErrors(): void
+    {
+        $data = [
+            'foo' => 'notanumber',
+            'bar' => 'notanumber',
+        ];
+        $this->validation->setRule(
+            'foo',
+            'Foo',
+            ['foo'        => 'is_numeric'],
+            ['is_numeric' => 'Nope. Not a number.']
+        );
+        $this->validation->setRule(
+            'bar',
+            'Bar',
+            ['bar'        => 'is_numeric'],
+            ['is_numeric' => 'Nope. Not a number.']
+        );
         $this->validation->run($data);
+
         $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
+        $this->assertSame('Nope. Not a number.', $this->validation->getError('bar'));
     }
 
     public function testCheck(): void