Merge pull request #8959 from kenjis/fix-if_exist-with-array

fix: [Validation] `if_exist` does not work with array data
codeigniter4 · Jun 19, 2024 · 2fae945 · 2fae945
2 parents ad73071 + cdec7d0
commit 2fae945
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
@@ -399,8 +399,10 @@ private function processIfExist(string $field, array $rules, array $data)
                         break;
                     }
                 }
-            } else {
+            } elseif (str_contains($field, '.')) {
                 $dataIsExisting = array_key_exists($ifExistField, $flattenedData);
+            } else {
+                $dataIsExisting = array_key_exists($ifExistField, $data);
             }
 
             if (! $dataIsExisting) {

diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
@@ -15,6 +15,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
+use ErrorException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use stdClass;
@@ -126,6 +127,19 @@ public static function provideIfExist(): iterable
         ];
     }
 
+    public function testIfExistArray(): void
+    {
+        $this->expectException(ErrorException::class);
+        $this->expectExceptionMessage('Array to string conversion');
+
+        $rules = ['foo' => 'if_exist|alpha'];
+        // Invalid array input
+        $data = ['foo' => ['bar' => '12345']];
+
+        $this->validation->setRules($rules);
+        $this->validation->run($data);
+    }
+
     #[DataProvider('providePermitEmpty')]
     public function testPermitEmpty(array $rules, array $data, bool $expected): void
     {

diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
@@ -244,4 +244,14 @@ public static function provideDiffers(): iterable
             'foo bar bool match'       => [['foo' => true, 'bar' => true], false],
         ];
     }
+
+    public function testIfExistArray(): void
+    {
+        $rules = ['foo' => 'if_exist|alpha'];
+        // Invalid array input
+        $data = ['foo' => ['bar' => '12345']];
+
+        $this->validation->setRules($rules);
+        $this->assertFalse($this->validation->run($data));
+    }
 }