Merge pull request #5861 from kenjis/fix-model-validation-twice

fix: validation errors in Model are not cleared when running validation again

phpstan-baseline.neon.dist

@@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: system/Autoloader/Autoloader.php
 
-		-
-			message: "#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:run\\(\\) invoked with 3 parameters, 0\\-2 required\\.$#"
-			count: 1
-			path: system/BaseModel.php
-
 		-
 			message: "#^Property Config\\\\Cache\\:\\:\\$backupHandler \\(string\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1

system/BaseModel.php

@@ -1344,7 +1344,9 @@ public function validate($data): bool
             return true;
         }
 
-        return $this->validation->setRules($rules, $this->validationMessages)->run($data, null, $this->DBGroup);
+        $this->validation->reset()->setRules($rules, $this->validationMessages);
+
+        return $this->validation->run($data, null, $this->DBGroup);
     }
 
     /**

tests/system/Models/ValidationModelTest.php

@@ -55,6 +55,29 @@ public function testValidationBasics(): void
         $this->assertSame('You forgot to name the baby.', $errors['name']);
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5859
+     */
+    public function testValidationTwice(): void
+    {
+        $data = [
+            'name'        => null,
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->assertFalse($this->model->insert($data));
+
+        $errors = $this->model->errors();
+        $this->assertSame('You forgot to name the baby.', $errors['name']);
+
+        $data = [
+            'name'        => 'some name',
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->assertIsInt($this->model->insert($data));
+    }
+
     public function testValidationWithSetValidationRule(): void
     {
         $data = [