Merge remote-tracking branch 'upstream/develop' into 4.4

codeigniter4 · May 14, 2023 · 3b3cfb5 · 3b3cfb5
2 parents 3089cda + fb0583f
commit 3b3cfb5
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
@@ -59,9 +59,6 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
-        include:
-          - php-version: '8.2'
-            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -73,7 +70,6 @@ jobs:
       enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: imagick, redis, memcached
-      extra-composer-options: ${{ matrix.composer-option }}
 
   database-live-tests:
     needs:
@@ -100,8 +96,6 @@ jobs:
           - php-version: '7.4'
             db-platform: MySQLi
             mysql-version: '8.0'
-          - php-version: '8.2'
-            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -115,7 +109,6 @@ jobs:
       enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
-      extra-composer-options: ${{ matrix.composer-option }}
 
   separate-process-tests:
     needs:
@@ -129,9 +122,6 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
-        include:
-          - php-version: '8.2'
-            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -143,7 +133,6 @@ jobs:
       enable-coverage: true # needs xdebug for assertHeaderEmitted() tests
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
-      extra-composer-options: ${{ matrix.composer-option }}
 
   cache-live-tests:
     needs:
@@ -157,9 +146,6 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
-        include:
-          - php-version: '8.2'
-            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -171,7 +157,6 @@ jobs:
       enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
       extra-extensions: redis, memcached
-      extra-composer-options: ${{ matrix.composer-option }}
 
   coveralls:
     name: Upload coverage results to Coveralls

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.15.25",
+        "rector/rector": "0.16.0",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
@@ -13,17 +13,13 @@
 
 use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
 /**
  * Provides common, more readable, methods to provide
  * consistent HTTP responses under a variety of common
  * situations when working as an API.
- *
- * @property RequestInterface  $request
- * @property ResponseInterface $response
  */
 trait ResponseTrait
 {

diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
@@ -405,7 +405,7 @@ public function enableFilters(array $names, string $when = 'before')
     /**
      * Returns the arguments for a specified key, or all.
      *
-     * @return mixed
+     * @return array<string, string>|string
      */
     public function getArguments(?string $key = null)
     {

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
@@ -270,7 +270,7 @@ protected function processRules(
             }
 
             // Otherwise remove the if_exist rule and continue the process
-            $rules = array_diff($rules, ['if_exist']);
+            $rules = array_filter($rules, static fn ($rule) => $rule instanceof Closure || $rule !== 'if_exist');
         }
 
         if (in_array('permit_empty', $rules, true)) {
@@ -281,7 +281,7 @@ protected function processRules(
                 $passed = true;
 
                 foreach ($rules as $rule) {
-                    if (preg_match('/(.*?)\[(.*)\]/', $rule, $match)) {
+                    if (! $this->isClosure($rule) && preg_match('/(.*?)\[(.*)\]/', $rule, $match)) {
                         $rule  = $match[1];
                         $param = $match[2];
 
@@ -306,7 +306,7 @@ protected function processRules(
                 }
             }
 
-            $rules = array_diff($rules, ['permit_empty']);
+            $rules = array_filter($rules, static fn ($rule) => $rule instanceof Closure || $rule !== 'permit_empty');
         }
 
         foreach ($rules as $i => $rule) {

diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
@@ -117,6 +117,12 @@ public function ifExistProvider(): Generator
                 ['foo' => []],
                 true,
             ],
+            // Testing with closure
+            [
+                ['foo' => ['if_exist', static fn ($value) => true]],
+                ['foo' => []],
+                true,
+            ],
         ];
     }
 
@@ -275,6 +281,12 @@ public function providePermitEmptyCases(): Generator
                 ['foo' => '', 'bar' => 1],
                 true,
             ],
+            // Testing with closure
+            [
+                ['foo' => ['permit_empty', static fn ($value) => true]],
+                ['foo' => ''],
+                true,
+            ],
         ];
     }
 

diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
@@ -84,6 +84,12 @@ public function providePermitEmptyCasesStrict(): Generator
                 ['foo' => false],
                 true,
             ],
+            // Testing with closure
+            [
+                ['foo' => ['permit_empty', static fn ($value) => true]],
+                ['foo' => ''],
+                true,
+            ],
         ];
     }
 

diff --git a/user_guide_src/source/changelogs/v4.3.5.rst b/user_guide_src/source/changelogs/v4.3.5.rst
@@ -24,6 +24,8 @@ Deprecations
 Bugs Fixed
 **********
 
+- **Validation:** Fixed a bug where a closure used in combination with ``permit_empty`` or ``if_exist`` rules was causing an error.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.