fix: strict validation rule matches and differs

Author: kenjis

system/Validation/StrictRules/Rules.php

@@ -36,13 +36,26 @@ public function __construct()
      * @param array|bool|float|int|object|string|null $str
      * @param array                                   $data Other field/value pairs
      */
-    public function differs($str, string $field, array $data): bool
-    {
-        if (! is_string($str)) {
+    public function differs(
+        $str,
+        string $otherField,
+        array $data,
+        ?string $error = null,
+        ?string $field = null
+    ): bool {
+        if (strpos($otherField, '.') !== false) {
+            return $str !== dot_array_search($otherField, $data);
+        }
+
+        if (! array_key_exists($field, $data)) {
             return false;
         }
 
-        return $this->nonStrictRules->differs($str, $field, $data);
+        if (! array_key_exists($otherField, $data)) {
+            return false;
+        }
+
+        return $str !== ($data[$otherField] ?? null);
     }
 
     /**
@@ -254,9 +267,26 @@ public function less_than_equal_to($str, string $max): bool
      * @param array|bool|float|int|object|string|null $str
      * @param array                                   $data Other field/value pairs
      */
-    public function matches($str, string $field, array $data): bool
-    {
-        return $this->nonStrictRules->matches($str, $field, $data);
+    public function matches(
+        $str,
+        string $otherField,
+        array $data,
+        ?string $error = null,
+        ?string $field = null
+    ): bool {
+        if (strpos($otherField, '.') !== false) {
+            return $str === dot_array_search($otherField, $data);
+        }
+
+        if (! array_key_exists($field, $data)) {
+            return false;
+        }
+
+        if (! array_key_exists($otherField, $data)) {
+            return false;
+        }
+
+        return $str === ($data[$otherField] ?? null);
     }
 
     /**

tests/system/Validation/RulesTest.php

@@ -303,13 +303,13 @@ public static function provideMatches(): iterable
         yield from [
             'foo bar not exist'        => [[], false],
             'bar not exist'            => [['foo' => null], false],
-            'foo not exist'            => [['bar' => null], true], // should be false?
+            'foo not exist'            => [['bar' => null], true], // Strict Rule: false
             'foo bar null'             => [['foo' => null, 'bar' => null], true],
             'foo bar string match'     => [['foo' => 'match', 'bar' => 'match'], true],
             'foo bar string not match' => [['foo' => 'match', 'bar' => 'nope'], false],
-            'foo bar float match'      => [['foo' => 1.2, 'bar' => 1.2], false], // should be true
+            'foo bar float match'      => [['foo' => 1.2, 'bar' => 1.2], false], // Strict Rule: true
             'foo bar float not match'  => [['foo' => 1.2, 'bar' => 2.3], false],
-            'foo bar bool match'       => [['foo' => true, 'bar' => true], false], // should be true
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], false], // Strict Rule: true
         ];
     }
 
@@ -348,9 +348,9 @@ public static function provideDiffers(): iterable
             'foo bar null'             => [['foo' => null, 'bar' => null], false],
             'foo bar string match'     => [['foo' => 'match', 'bar' => 'match'], false],
             'foo bar string not match' => [['foo' => 'match', 'bar' => 'nope'], true],
-            'foo bar float match'      => [['foo' => 1.2, 'bar' => 1.2], true], // should be false
+            'foo bar float match'      => [['foo' => 1.2, 'bar' => 1.2], true], // Strict Rule: false
             'foo bar float not match'  => [['foo' => 1.2, 'bar' => 2.3], true],
-            'foo bar bool match'       => [['foo' => true, 'bar' => true], true], // should be false
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], true], // Strict Rule: false
         ];
     }
 

tests/system/Validation/StrictRules/RulesTest.php

@@ -213,16 +213,13 @@ public static function provideMatches(): iterable
         yield from [
             'foo bar not exist'        => [[], false],
             'bar not exist'            => [['foo' => null], false],
-            'foo not exist'            => [['bar' => null], true],
+            'foo not exist'            => [['bar' => null], false],
             'foo bar null'             => [['foo' => null, 'bar' => null], true],
             'foo bar string match'     => [['foo' => 'match', 'bar' => 'match'], true],
             'foo bar string not match' => [['foo' => 'match', 'bar' => 'nope'], false],
-            // TypeError: CodeIgniter\Validation\Rules::matches(): Argument #1 ($str) must be of type ?string, float given
-            // 'foo bar float match' => [['foo' => 1.2, 'bar' => 1.2], true],
-            // TypeError: CodeIgniter\Validation\Rules::matches(): Argument #1 ($str) must be of type ?string, float given
-            // 'foo bar float not match' => [['foo' => 1.2, 'bar' => 2.3], false],
-            // TypeError: CodeIgniter\Validation\Rules::matches(): Argument #1 ($str) must be of type ?string, float given
-            // 'foo bar bool match' => [['foo' => true, 'bar' => true], true],
+            'foo bar float match'      => [['foo' => 1.2, 'bar' => 1.2], true],
+            'foo bar float not match'  => [['foo' => 1.2, 'bar' => 2.3], false],
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], true],
         ];
     }
 
@@ -245,7 +242,7 @@ public static function provideDiffers(): iterable
             'foo bar string match'     => [['foo' => 'match', 'bar' => 'match'], false],
             'foo bar string not match' => [['foo' => 'match', 'bar' => 'nope'], true],
             'foo bar float match'      => [['foo' => 1.2, 'bar' => 1.2], false],
-            'foo bar float not match'  => [['foo' => 1.2, 'bar' => 2.3], false],
+            'foo bar float not match'  => [['foo' => 1.2, 'bar' => 2.3], true],
             'foo bar bool match'       => [['foo' => true, 'bar' => true], false],
         ];
     }