fix: rule differs and matches with dot array

codeigniter4 · Aug 3, 2024 · 156e45b · 156e45b
1 parent ab82f41
commit 156e45b
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
@@ -48,11 +48,15 @@ public function differs(
             return $str !== dot_array_search($otherField, $data);
         }
 
-        if (! array_key_exists($field, $data)) {
+        if (! array_key_exists($otherField, $data)) {
             return false;
         }
 
-        if (! array_key_exists($otherField, $data)) {
+        if (str_contains($field, '.')) {
+            if (! ArrayHelper::dotKeyExists($field, $data)) {
+                return false;
+            }
+        } elseif (! array_key_exists($field, $data)) {
             return false;
         }
 
@@ -281,11 +285,15 @@ public function matches(
             return $str === dot_array_search($otherField, $data);
         }
 
-        if (! array_key_exists($field, $data)) {
+        if (! array_key_exists($otherField, $data)) {
             return false;
         }
 
-        if (! array_key_exists($otherField, $data)) {
+        if (str_contains($field, '.')) {
+            if (! ArrayHelper::dotKeyExists($field, $data)) {
+                return false;
+            }
+        } elseif (! array_key_exists($field, $data)) {
             return false;
         }