fix: TypeError in Rules::is_unique()

TypeError : CodeIgniter\Validation\Rules::is_unique(): Argument #1 ($str) must be of type ?string, int given, called in /.../CodeIgniter4/system/Validation/StrictRules/Rules.php on line 154 /.../CodeIgniter4/system/Validation/Rules.php:126
kenjis · Jan 11, 2023 · d7099cc · d7099cc
1 parent 5ab8487
commit d7099cc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 deletions.
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Validation;
 
+use CodeIgniter\Validation\StrictRules\Rules as StrictRules;
 use Config\Database;
 use InvalidArgumentException;
 
@@ -19,6 +20,15 @@
  */
 class Rules
 {
+    private ?StrictRules $strictRules = null;
+
+    private function createStrictRules(): void
+    {
+        if ($this->strictRules === null) {
+            $this->strictRules = new StrictRules();
+        }
+    }
+
     /**
      * The value does not match another field in $data.
      *
@@ -125,21 +135,9 @@ public function in_list(?string $value, string $list): bool
      */
     public function is_unique(?string $str, string $field, array $data): bool
     {
-        [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
-
-        sscanf($field, '%[^.].%[^.]', $table, $field);
-
-        $row = Database::connect($data['DBGroup'] ?? null)
-            ->table($table)
-            ->select('1')
-            ->where($field, $str)
-            ->limit(1);
-
-        if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
-            $row = $row->where("{$ignoreField} !=", $ignoreValue);
-        }
+        $this->createStrictRules();
 
-        return $row->get()->getRow() === null;
+        return $this->strictRules->is_unique($str, $field, $data);
     }
 
     /**

diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
@@ -151,7 +151,25 @@ public function in_list($value, string $list): bool
      */
     public function is_unique($str, string $field, array $data): bool
     {
-        return $this->nonStrictRules->is_unique($str, $field, $data);
+        [$field, $ignoreField, $ignoreValue] = array_pad(
+            explode(',', $field),
+            3,
+            null
+        );
+
+        sscanf($field, '%[^.].%[^.]', $table, $field);
+
+        $row = Database::connect($data['DBGroup'] ?? null)
+            ->table($table)
+            ->select('1')
+            ->where($field, $str)
+            ->limit(1);
+
+        if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
+            $row = $row->where("{$ignoreField} !=", $ignoreValue);
+        }
+
+        return $row->get()->getRow() === null;
     }
 
     /**