refactor: normailze $this->rules

Author: kenjis

system/Validation/Validation.php

@@ -40,10 +40,18 @@ class Validation implements ValidationInterface
     protected $ruleSetInstances = [];
 
     /**
-     * Stores the actual rules that should
-     * be ran against $data.
+     * Stores the actual rules that should be run against $data.
      *
      * @var array
+     *
+     * [
+     *     field1 => [
+     *         'label' => label,
+     *         'rules' => [
+     *              rule1, rule2, ...
+     *          ],
+     *     ],
+     * ]
      */
     protected $rules = [];
 
@@ -133,8 +141,7 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
         // Run through each rule. If we have any field set for
         // this rule, then we need to run them through!
         foreach ($this->rules as $field => $setup) {
-            // Blast $rSetup apart, unless it's already an array.
-            $rules = $setup['rules'] ?? $setup;
+            $rules = $setup['rules'];
 
             if (is_string($rules)) {
                 $rules = $this->splitRules($rules);
@@ -483,6 +490,14 @@ public function setRules(array $rules, array $errors = []): ValidationInterface
                     $rule = ['rules' => $rule];
                 }
             }
+
+            if (isset($rule['rules']) && is_string($rule['rules'])) {
+                $rule['rules'] = $this->splitRules($rule['rules']);
+            }
+
+            if (is_string($rule)) {
+                $rule = ['rules' => $this->splitRules($rule)];
+            }
         }
 
         $this->rules = $rules;

tests/system/Validation/ValidationTest.php

@@ -86,7 +86,12 @@ public function testSetRulesStoresRules(): void
             'bar' => 'baz|belch',
         ];
         $this->validation->setRules($rules);
-        $this->assertSame($rules, $this->validation->getRules());
+
+        $expected = [
+            'foo' => ['rules' => ['bar', 'baz']],
+            'bar' => ['rules' => ['baz', 'belch']],
+        ];
+        $this->assertSame($expected, $this->validation->getRules());
     }
 
     public function testSetRuleStoresRule()
@@ -97,7 +102,7 @@ public function testSetRuleStoresRule()
         $this->assertSame([
             'foo' => [
                 'label' => null,
-                'rules' => 'bar|baz',
+                'rules' => ['bar', 'baz'],
             ],
         ], $this->validation->getRules());
     }
@@ -110,7 +115,7 @@ public function testSetRuleMultipleWithIndividual()
         $this->assertSame([
             'username' => [
                 'label' => 'Username',
-                'rules' => 'required|min_length[3]',
+                'rules' => ['required', 'min_length[3]'],
             ],
             'password' => [
                 'label' => 'Password',
@@ -136,11 +141,11 @@ public function testSetRuleAddsRule()
         $this->assertSame([
             'bar' => [
                 'label' => null,
-                'rules' => 'bar|baz',
+                'rules' => ['bar', 'baz'],
             ],
             'foo' => [
                 'label' => null,
-                'rules' => 'foo|foz',
+                'rules' => ['foo', 'foz'],
             ],
         ], $this->validation->getRules());
     }
@@ -158,7 +163,7 @@ public function testSetRuleOverwritesRule()
         $this->assertSame([
             'foo' => [
                 'label' => null,
-                'rules' => 'foo|foz',
+                'rules' => ['foo', 'foz'],
             ],
         ], $this->validation->getRules());
     }
@@ -176,7 +181,7 @@ public function testSetRuleOverwritesRuleReverse()
         $this->assertSame([
             'foo' => [
                 'label' => null,
-                'rules' => 'bar|baz',
+                'rules' => ['bar', 'baz'],
             ],
         ], $this->validation->getRules());
     }
@@ -549,7 +554,7 @@ public function testSetRuleGroup(): void
     {
         $this->validation->setRuleGroup('groupA');
         $this->assertSame([
-            'foo' => 'required|min_length[5]',
+            'foo' => ['rules' => ['required', 'min_length[5]']],
         ], $this->validation->getRules());
     }