Merge pull request #7149 from ddevsr/ordering-validation

fix: ordering `Validation` show error by call `setRule()`

Author: samsonasik

system/Validation/Validation.php

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

tests/system/Validation/ValidationTest.php

@@ -102,6 +102,27 @@ public function testSetRuleStoresRule()
         ], $this->validation->getRules());
     }
 
+    public function testSetRuleMultipleWithIndividual()
+    {
+        $this->validation->setRule('username', 'Username', 'required|min_length[3]');
+        $this->validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']);
+
+        $this->assertSame([
+            'username' => [
+                'label' => 'Username',
+                'rules' => 'required|min_length[3]',
+            ],
+            'password' => [
+                'label' => 'Password',
+                'rules' => [
+                    'required',
+                    'min_length[8]',
+                    'alpha_numeric_punct',
+                ],
+            ],
+        ], $this->validation->getRules());
+    }
+
     public function testSetRuleAddsRule()
     {
         $this->validation->setRules([
@@ -113,14 +134,14 @@ public function testSetRuleAddsRule()
         $this->validation->setRule('foo', null, 'foo|foz');
 
         $this->assertSame([
-            'foo' => [
-                'label' => null,
-                'rules' => 'foo|foz',
-            ],
             'bar' => [
                 'label' => null,
                 'rules' => 'bar|baz',
             ],
+            'foo' => [
+                'label' => null,
+                'rules' => 'foo|foz',
+            ],
         ], $this->validation->getRules());
     }
 
@@ -142,6 +163,24 @@ public function testSetRuleOverwritesRule()
         ], $this->validation->getRules());
     }
 
+    public function testSetRuleOverwritesRuleReverse()
+    {
+        $this->validation->setRule('foo', null, 'foo|foz');
+        $this->validation->setRules([
+            'foo' => [
+                'label' => null,
+                'rules' => 'bar|baz',
+            ],
+        ]);
+
+        $this->assertSame([
+            'foo' => [
+                'label' => null,
+                'rules' => 'bar|baz',
+            ],
+        ], $this->validation->getRules());
+    }
+
     /**
      * @dataProvider setRuleRulesFormatCaseProvider
      *