From 67f8876f6ecba3b5daa701b667dbc3be63eb6c83 Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:34:52 +0300
Subject: [PATCH 001/380] refactor: ViewDecoratorTrait

Use `View::$config` instead of  `config()` function
---
 system/View/ViewDecoratorTrait.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
index 97cdbe0a252d..da7a57189981 100644
--- a/system/View/ViewDecoratorTrait.php
+++ b/system/View/ViewDecoratorTrait.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\View;
 
 use CodeIgniter\View\Exceptions\ViewException;
-use Config\View as ViewConfig;
 
 trait ViewDecoratorTrait
 {
@@ -22,9 +21,7 @@ trait ViewDecoratorTrait
      */
     protected function decorateOutput(string $html): string
     {
-        $decorators = \config(ViewConfig::class)->decorators;
-
-        foreach ($decorators as $decorator) {
+        foreach ($this->config->decorators as $decorator) {
             if (! is_subclass_of($decorator, ViewDecoratorInterface::class)) {
                 throw ViewException::forInvalidDecorator($decorator);
             }

From b576cd98c8cab80e95bd8fa47f6f07af4fde862f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 09:23:13 +0900
Subject: [PATCH 002/380] chore: update templates for changelog/upgrading

---
 admin/next-changelog-minor.rst | 8 ++++++++
 admin/next-changelog-patch.rst | 6 ++++++
 admin/next-upgrading-guide.rst | 4 ++++
 3 files changed, 18 insertions(+)

diff --git a/admin/next-changelog-minor.rst b/admin/next-changelog-minor.rst
index f5bb20004d77..c22f0be7d9f3 100644
--- a/admin/next-changelog-minor.rst
+++ b/admin/next-changelog-minor.rst
@@ -1,3 +1,4 @@
+#################
 Version {version}
 #################
 
@@ -9,11 +10,13 @@ Release Date: Unreleased
     :local:
     :depth: 3
 
+**********
 Highlights
 **********
 
 - TBD
 
+********
 BREAKING
 ********
 
@@ -26,6 +29,7 @@ Interface Changes
 Method Signature Changes
 ========================
 
+************
 Enhancements
 ************
 
@@ -59,15 +63,19 @@ Helpers and Functions
 Others
 ======
 
+***************
 Message Changes
 ***************
 
+*******
 Changes
 *******
 
+************
 Deprecations
 ************
 
+**********
 Bugs Fixed
 **********
 
diff --git a/admin/next-changelog-patch.rst b/admin/next-changelog-patch.rst
index 4c76ca01a112..ed2ba70570b3 100644
--- a/admin/next-changelog-patch.rst
+++ b/admin/next-changelog-patch.rst
@@ -1,3 +1,4 @@
+#################
 Version {version}
 #################
 
@@ -9,18 +10,23 @@ Release Date: Unreleased
     :local:
     :depth: 3
 
+********
 BREAKING
 ********
 
+***************
 Message Changes
 ***************
 
+*******
 Changes
 *******
 
+************
 Deprecations
 ************
 
+**********
 Bugs Fixed
 **********
 
diff --git a/admin/next-upgrading-guide.rst b/admin/next-upgrading-guide.rst
index fb97f320e95a..bcffc3fe3de5 100644
--- a/admin/next-upgrading-guide.rst
+++ b/admin/next-upgrading-guide.rst
@@ -12,15 +12,19 @@ Please refer to the upgrade instructions corresponding to your installation meth
     :local:
     :depth: 2
 
+**********************
 Mandatory File Changes
 **********************
 
+****************
 Breaking Changes
 ****************
 
+*********************
 Breaking Enhancements
 *********************
 
+*************
 Project Files
 *************
 

From 567a4bea3b5da3be4f90aba2a392ab5c8a4451d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 09:28:17 +0900
Subject: [PATCH 003/380] chore: add scripts for release process

---
 admin/create-new-changelog.php | 87 ++++++++++++++++++++++++++++++++++
 admin/prepare-release.php      | 61 ++++++++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 admin/create-new-changelog.php
 create mode 100644 admin/prepare-release.php

diff --git a/admin/create-new-changelog.php b/admin/create-new-changelog.php
new file mode 100644
index 000000000000..ff371345d166
--- /dev/null
+++ b/admin/create-new-changelog.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+function replace_file_content(string $path, string $pattern, string $replace): void
+{
+    $file   = file_get_contents($path);
+    $output = preg_replace($pattern, $replace, $file);
+    file_put_contents($path, $output);
+}
+
+// Main.
+chdir(__DIR__ . '/..');
+
+if ($argc !== 3) {
+    echo "Usage: php {$argv[0]} <current_version> <new_version>" . PHP_EOL;
+    echo "E.g.,: php {$argv[0]} 4.4.3 4.4.4" . PHP_EOL;
+
+    exit(1);
+}
+
+// Gets version number from argument.
+$versionCurrent      = $argv[1]; // e.g., '4.4.3'
+$versionCurrentParts = explode('.', $versionCurrent);
+$minorCurrent        = $versionCurrentParts[0] . '.' . $versionCurrentParts[1];
+$version             = $argv[2]; // e.g., '4.4.4'
+$versionParts        = explode('.', $version);
+$minor               = $versionParts[0] . '.' . $versionParts[1];
+$isMinorUpdate       = ($minorCurrent !== $minor);
+
+// Creates a branch for release.
+system('git switch develop');
+system('git switch -c docs-changelog-' . $version);
+system('git switch docs-changelog-' . $version);
+
+// Copy changelog
+$changelog      = "./user_guide_src/source/changelogs/v{$version}.rst";
+$changelogIndex = './user_guide_src/source/changelogs/index.rst';
+if ($isMinorUpdate) {
+    copy('./admin/next-changelog-minor.rst', $changelog);
+} else {
+    copy('./admin/next-changelog-patch.rst', $changelog);
+}
+// Add changelog to index.rst.
+replace_file_content(
+    $changelogIndex,
+    '/\.\. toctree::\n    :titlesonly:\n/u',
+    ".. toctree::\n    :titlesonly:\n\n    v{$version}"
+);
+// Replace {version}
+$length    = mb_strlen("Version {$version}");
+$underline = str_repeat('#', $length);
+replace_file_content(
+    $changelog,
+    '/#################\nVersion {version}\n#################/u',
+    "{$underline}\nVersion {$version}\n{$underline}"
+);
+replace_file_content(
+    $changelog,
+    '/{version}/u',
+    "{$version}"
+);
+
+// Copy upgrading
+$versionWithoutDots = str_replace('.', '', $version);
+$upgrading          = "./user_guide_src/source/installation/upgrade_{$versionWithoutDots}.rst";
+$upgradingIndex     = './user_guide_src/source/installation/upgrading.rst';
+copy('./admin/next-upgrading-guide.rst', $upgrading);
+// Add upgrading to upgrading.rst.
+replace_file_content(
+    $upgradingIndex,
+    '/    backward_compatibility_notes\n/u',
+    "    backward_compatibility_notes\n\n    upgrade_{$versionWithoutDots}"
+);
+// Replace {version}
+$length    = mb_strlen("Upgrading from {$versionCurrent} to {$version}");
+$underline = str_repeat('#', $length);
+replace_file_content(
+    $upgrading,
+    '/##############################\nUpgrading from {version} to {version}\n##############################/u',
+    "{$underline}\nUpgrading from {$versionCurrent} to {$version}\n{$underline}"
+);
+
+// Commits
+system("git add {$changelog} {$changelogIndex}");
+system("git add {$upgrading} {$upgradingIndex}");
+system('git commit -m "docs: add changelog and upgrade for v' . $version . '"');
diff --git a/admin/prepare-release.php b/admin/prepare-release.php
new file mode 100644
index 000000000000..1b173a0f75d6
--- /dev/null
+++ b/admin/prepare-release.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+function replace_file_content(string $path, string $pattern, string $replace): void
+{
+    $file   = file_get_contents($path);
+    $output = preg_replace($pattern, $replace, $file);
+    file_put_contents($path, $output);
+}
+
+// Main.
+chdir(__DIR__ . '/..');
+
+if ($argc !== 2) {
+    echo "Usage: php {$argv[0]} <version>" . PHP_EOL;
+    echo "E.g.,: php {$argv[0]} 4.4.3" . PHP_EOL;
+
+    exit(1);
+}
+
+// Gets version number from argument.
+$version      = $argv[1]; // e.g., '4.4.3'
+$versionParts = explode('.', $version);
+$minor        = $versionParts[0] . '.' . $versionParts[1];
+
+// Creates a branch for release.
+system('git switch develop');
+system('git switch -c release-' . $version);
+system('git switch docs-changelog-' . $version);
+
+// Updates version number in "CodeIgniter.php".
+replace_file_content(
+    './system/CodeIgniter.php',
+    '/public const CI_VERSION = \'.*?\';/u',
+    "public const CI_VERSION = '{$version}';"
+);
+
+// Updates version number in "conf.py".
+replace_file_content(
+    './user_guide_src/source/conf.py',
+    '/^version = \'.*?\'/mu',
+    "version = '{$minor}'"
+);
+replace_file_content(
+    './user_guide_src/source/conf.py',
+    '/^release = \'.*?\'/mu',
+    "release = '{$version}'"
+);
+
+// Updates release date in changelogs.
+$date = date('F j, Y');
+replace_file_content(
+    "./user_guide_src/source/changelogs/v{$version}.rst",
+    '/^Release Date: .*/mu',
+    "Release Date: {$date}"
+);
+
+// Commits
+system('git add -u');
+system('git commit -m "Prep for ' . $version . ' release"');

From ea2b26b9c41e17436ab5bca696562b56f9f63b1e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 09:28:48 +0900
Subject: [PATCH 004/380] docs: update RELEASE.md

---
 admin/RELEASE.md | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index 98089ae8181f..731527de0ed7 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -2,7 +2,7 @@
 
 > Documentation guide based on the releases of `4.0.5` and `4.1.0` on January 31, 2021.
 >
-> Updated for `4.3.0` on January 10, 2023.
+> Updated for `4.4.3` on October 27, 2023.
 >
 > -MGatner, kenjis
 
@@ -53,12 +53,18 @@ Work off direct clones of the repos so the release branches persist for a time.
 * [ ] Clone both **codeigniter4/CodeIgniter4** and **codeigniter4/userguide** and
   resolve any necessary PRs
     ```console
+    rm -rf CodeIgniter4.bk userguide.bk
+    mv CodeIgniter4 CodeIgniter4.bk
+    mv userguide userguide.bk
     git clone git@github.com:codeigniter4/CodeIgniter4.git
     git clone git@github.com:codeigniter4/userguide.git
     ```
 * [ ] Vet the **admin/** folders for any removed hidden files (Action deploy scripts
   *do not remove these*)
-  * git diff --name-status origin/master admin/
+  ```console
+  cd CodeIgniter4
+  git diff --name-status origin/master admin/
+  ```
 * [ ] Merge any Security Advisory PRs in private forks
 
 ## Process
@@ -67,21 +73,24 @@ Work off direct clones of the repos so the release branches persist for a time.
 > been included with their PR, so this process assumes you will not be
 > generating much new content.
 
-* [ ] Create a new branch `release-4.x.x`
-* [ ] Update **system/CodeIgniter.php** with the new version number:
-  `const CI_VERSION = '4.x.x';`
-* [ ] Update **user_guide_src/source/conf.py** with the new `version = '4.x'` (if applicable)
-  and `release = '4.x.x'`
 * [ ] Replace **CHANGELOG.md** with the new version generated above
 * [ ] Update **user_guide_src/source/changelogs/{version}.rst**
-  * Set the date to format `Release Date: January 31, 2021`
   * Remove the section titles that have no items
 * [ ] Update **user_guide_src/source/installation/upgrade_{ver}.rst**
   * fill in the "All Changes" section, and add it to **upgrading.rst**
     * git diff --name-status origin/master -- . ':!system'
   * Remove the section titles that have no items
   * [Minor version only] Update the "from" version in the title. E.g., `from 4.3.x` → `from 4.3.8`
-* [ ] Commit the changes with `Prep for 4.x.x release` and push to origin
+* [ ] Run `php admin/prepare-release.php 4.x.x` and push to origin
+  * The above command does the following:
+    * Create a new branch `release-4.x.x`
+    * Update **system/CodeIgniter.php** with the new version number:
+      `const CI_VERSION = '4.x.x';`
+    * Update **user_guide_src/source/conf.py** with the new `version = '4.x'` (if applicable)
+      and `release = '4.x.x'`
+    * Update **user_guide_src/source/changelogs/{version}.rst**
+      * Set the date to format `Release Date: January 31, 2021`
+    * Commit the changes with `Prep for 4.x.x release`
 * [ ] Create a new PR from `release-4.x.x` to `develop`:
   * Title: `Prep for 4.x.x release`
   * Description:
@@ -119,6 +128,7 @@ Work off direct clones of the repos so the release branches persist for a time.
 * [ ] Run the following commands to install and test `appstarter` and verify the new
   version:
     ```console
+    rm -rf release-test
     composer create-project codeigniter4/appstarter release-test
     cd release-test
     composer test && composer info codeigniter4/framework
@@ -152,7 +162,7 @@ Work off direct clones of the repos so the release branches persist for a time.
     git switch -c 4.x
     git push origin HEAD
     ```
-* [ ] Publish any Security Advisories that were resolved from private forks
+* [ ] Request CVEs and Publish any Security Advisories that were resolved from private forks
   (note: publishing is restricted to administrators):
 * [ ] Announce the release on the forums and Slack channel
   (note: this forum is restricted to administrators):
@@ -160,11 +170,13 @@ Work off direct clones of the repos so the release branches persist for a time.
     https://forum.codeigniter.com/forum-2.html
   * The content is somewhat organic, but should include any major features and
     changes as well as a link to the User Guide's changelog
+* [ ] Run `php admin/create-new-changelog.php <current_version> <new_version>`
+  * The above command does the following:
+    * Create **user_guide_src/source/changelogs/{next_version}.rst** and add it to
+      **index.rst** (See **next-changelog-*.rst**)
+    * Create **user_guide_src/source/installation/upgrade_{next_version}.rst** and add it to
+      **upgrading.rst** (See **next-upgrading-guide.rst**)
 * [ ] Create a PR for new changelog and upgrade for the next version
-  * Create **user_guide_src/source/changelogs/{next_version}.rst** and add it to
-    **index.rst** (See **next-changelog-*.rst**)
-  * Create **user_guide_src/source/installation/upgrade_{next_version}.rst** and add it to
-    **upgrading.rst** (See **next-upgrading-guide.rst**)
 
 ## Appendix
 

From ac49623389927b5ed9be20217ed61d7f7761cd1b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 09:22:07 +0900
Subject: [PATCH 005/380] docs: add changelog and upgrade for v4.4.4

---
 user_guide_src/source/changelogs/index.rst    |  1 +
 user_guide_src/source/changelogs/v4.4.4.rst   | 35 ++++++++++++
 .../source/installation/upgrade_444.rst       | 54 +++++++++++++++++++
 .../source/installation/upgrading.rst         |  1 +
 4 files changed, 91 insertions(+)
 create mode 100644 user_guide_src/source/changelogs/v4.4.4.rst
 create mode 100644 user_guide_src/source/installation/upgrade_444.rst

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 5863f9c4fd8f..eb9f7f1f5edb 100644
--- a/user_guide_src/source/changelogs/index.rst
+++ b/user_guide_src/source/changelogs/index.rst
@@ -12,6 +12,7 @@ See all the changes.
 .. toctree::
     :titlesonly:
 
+    v4.4.4
     v4.4.3
     v4.4.2
     v4.4.1
diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
new file mode 100644
index 000000000000..218c56e738d7
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -0,0 +1,35 @@
+#############
+Version 4.4.4
+#############
+
+Release Date: Unreleased
+
+**4.4.4 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 3
+
+********
+BREAKING
+********
+
+***************
+Message Changes
+***************
+
+*******
+Changes
+*******
+
+************
+Deprecations
+************
+
+**********
+Bugs Fixed
+**********
+
+See the repo's
+`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
+for a complete list of bugs fixed.
diff --git a/user_guide_src/source/installation/upgrade_444.rst b/user_guide_src/source/installation/upgrade_444.rst
new file mode 100644
index 000000000000..6dbfa8e7baac
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_444.rst
@@ -0,0 +1,54 @@
+#############################
+Upgrading from 4.4.3 to 4.4.4
+#############################
+
+Please refer to the upgrade instructions corresponding to your installation method.
+
+- :ref:`Composer Installation App Starter Upgrading <app-starter-upgrading>`
+- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading <adding-codeigniter4-upgrading>`
+- :ref:`Manual Installation Upgrading <installing-manual-upgrading>`
+
+.. contents::
+    :local:
+    :depth: 2
+
+**********************
+Mandatory File Changes
+**********************
+
+****************
+Breaking Changes
+****************
+
+*********************
+Breaking Enhancements
+*********************
+
+*************
+Project Files
+*************
+
+Some files in the **project space** (root, app, public, writable) received updates. Due to
+these files being outside of the **system** scope they will not be changed without your intervention.
+
+There are some third-party CodeIgniter modules available to assist with merging changes to
+the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
+
+Content Changes
+===============
+
+The following files received significant changes (including deprecations or visual adjustments)
+and it is recommended that you merge the updated versions with your application:
+
+Config
+------
+
+- @TODO
+
+All Changes
+===========
+
+This is a list of all files in the **project space** that received changes;
+many will be simple comments or formatting that have no effect on the runtime:
+
+- @TODO
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index b768959eb6c4..2c0731f3a437 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`.
 
     backward_compatibility_notes
 
+    upgrade_444
     upgrade_443
     upgrade_442
     upgrade_441

From 94e082f252d36ee685295966d4414ed898247f20 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 09:18:18 +0900
Subject: [PATCH 006/380] chore: add names to github workflows

To change the GitHub PR page display.
---
 .github/workflows/test-autoreview.yml | 1 +
 .github/workflows/test-phpunit.yml    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
index 44feb4e33139..1f2f785fb77c 100644
--- a/.github/workflows/test-autoreview.yml
+++ b/.github/workflows/test-autoreview.yml
@@ -23,6 +23,7 @@ permissions:
 
 jobs:
   auto-review-tests:
+    name: AutoReview
     uses: ./.github/workflows/reusable-serviceless-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
       job-name: Automatic Code Review [PHP 8.1]
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 9ca4ed8e15e4..856d11b17249 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -50,6 +50,7 @@ jobs:
           echo "version=8.1" >> $GITHUB_OUTPUT
 
   sanity-tests:
+    name: Others
     needs: coverage-php-version
 
     strategy:
@@ -77,6 +78,7 @@ jobs:
       extra-composer-options: ${{ matrix.composer-option }}
 
   database-live-tests:
+    name: DatabaseLive
     needs:
       - coverage-php-version
       - sanity-tests
@@ -120,6 +122,7 @@ jobs:
       extra-composer-options: ${{ matrix.composer-option }}
 
   separate-process-tests:
+    name: SeparateProcess
     needs:
       - coverage-php-version
       - sanity-tests
@@ -149,6 +152,7 @@ jobs:
       extra-composer-options: ${{ matrix.composer-option }}
 
   cache-live-tests:
+    name: CacheLive
     needs:
       - coverage-php-version
       - sanity-tests

From f22efe17e07dbb775601595a44d5d76fad49ea05 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 10:11:11 +0900
Subject: [PATCH 007/380] chore: change names for shorter name display

---
 .github/workflows/test-autoreview.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
index 1f2f785fb77c..69545ca6af01 100644
--- a/.github/workflows/test-autoreview.yml
+++ b/.github/workflows/test-autoreview.yml
@@ -1,4 +1,4 @@
-name: Automatic Code Review
+name: AutoReview
 
 on:
   pull_request:
@@ -23,10 +23,10 @@ permissions:
 
 jobs:
   auto-review-tests:
-    name: AutoReview
+    name: Automatic Code Review
     uses: ./.github/workflows/reusable-serviceless-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
-      job-name: Automatic Code Review [PHP 8.1]
+      job-name: PHP 8.1
       php-version: '8.1'
       job-id: auto-review-tests
       group-name: AutoReview

From 1bae325c9f0132bfc8b2edb0196f516c36ccbd4a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 10:54:09 +0900
Subject: [PATCH 008/380] chore: make long job-names empty

---
 .github/workflows/test-phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 856d11b17249..c6deb546bb7d 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -109,7 +109,7 @@ jobs:
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
-      job-name: Database Live Tests
+      job-name:
       php-version: ${{ matrix.php-version }}
       job-id: database-live-tests
       db-platform: ${{ matrix.db-platform }}
@@ -141,7 +141,7 @@ jobs:
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
-      job-name: Separate Process Tests
+      job-name:
       php-version: ${{ matrix.php-version }}
       job-id: separate-process-tests
       group-name: SeparateProcess

From 1de08fa47e0cc465330aa1b13659088b830d5e38 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 27 Oct 2023 13:22:26 +0700
Subject: [PATCH 009/380] [Rector] Apply SingleInArrayToCompareRector

---
 rector.php                               |  2 ++
 system/Config/BaseService.php            |  2 +-
 tests/system/Database/Live/GroupTest.php | 16 ++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/rector.php b/rector.php
index 89b92f15e58d..747cd4ce8bbd 100644
--- a/rector.php
+++ b/rector.php
@@ -16,6 +16,7 @@
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
+use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
@@ -142,4 +143,5 @@
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
     $rectorConfig->rule(BooleanInIfConditionRuleFixerRector::class);
+    $rectorConfig->rule(SingleInArrayToCompareRector::class);
 };
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 22daf7b69e4b..1c80c80d77c6 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -343,7 +343,7 @@ protected static function discoverServices(string $name, array $arguments)
                 foreach ($files as $file) {
                     $classname = $locator->getClassname($file);
 
-                    if (! in_array($classname, [Services::class], true)) {
+                    if ($classname !== Services::class) {
                         static::$services[] = new $classname();
                     }
                 }
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index c953645dcab4..b509229ece08 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -40,7 +40,7 @@ public function testGroupBy(): void
 
     public function testHavingBy(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -63,7 +63,7 @@ public function testHavingBy(): void
 
     public function testOrHavingBy(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('user')
@@ -134,7 +134,7 @@ public function testHavingNotIn(): void
 
     public function testOrHavingNotIn(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -207,7 +207,7 @@ public function testOrHavingLike(): void
 
     public function testOrNotHavingLike(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -237,7 +237,7 @@ public function testOrNotHavingLike(): void
 
     public function testAndHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -271,7 +271,7 @@ public function testAndHavingGroupStart(): void
 
     public function testOrHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -306,7 +306,7 @@ public function testOrHavingGroupStart(): void
 
     public function testNotHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -340,7 +340,7 @@ public function testNotHavingGroupStart(): void
 
     public function testOrNotHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')

From 246ed66f7c6e3bf32f476182c2927f1688704e6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 Oct 2023 19:17:02 +0900
Subject: [PATCH 010/380] config: update curlrequest.shareOptions

The default value is false now.
---
 env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env b/env
index cb99e19c3a80..e60354b3c4f8 100644
--- a/env
+++ b/env
@@ -140,4 +140,4 @@
 # CURLRequest
 #--------------------------------------------------------------------
 
-# curlrequest.shareOptions = true
+# curlrequest.shareOptions = false

From 2b5b0814dc8e57f5fe205f166314aae267b73b27 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 27 Oct 2023 23:20:40 +0800
Subject: [PATCH 011/380] style: run cs-fix

---
 system/Exceptions/FrameworkException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
index 4cafd71177e2..faf3f1480126 100644
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@@ -66,7 +66,7 @@ public static function forMissingExtension(string $extension)
                 'The framework needs the following extension(s) installed and loaded: %s.',
                 $extension
             );
-            // @codeCoverageIgnoreEnd
+        // @codeCoverageIgnoreEnd
         } else {
             $message = lang('Core.missingExtension', [$extension]);
         }

From b421974ad3fbda6d089c1d523f9827c4784d6d30 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 27 Oct 2023 23:40:29 +0800
Subject: [PATCH 012/380] fix: add Closure signature for
 CodeIgniter::$controller

---
 phpstan-baseline.php   | 5 -----
 system/CodeIgniter.php | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 0d372afdb97c..c56d1becdfee 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -186,11 +186,6 @@
 	'count' => 6,
 	'path' => __DIR__ . '/system/CodeIgniter.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\CodeIgniter\\:\\:\\$controller type has no signature specified for Closure\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/CodeIgniter.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 9f9f6e174ca7..8299bfafa992 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -108,7 +108,7 @@ class CodeIgniter
     /**
      * Controller to use.
      *
-     * @var Closure|string
+     * @var (Closure(mixed...): ResponseInterface|string)|string
      */
     protected $controller;
 

From 42d77d6f9b1987449040b6c0530242bd6e9629b1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 28 Oct 2023 09:00:24 +0900
Subject: [PATCH 013/380] fix: change make:command default $group to `App`

`CodeIgniter` is already used for the framework commands.

CodeIgniter
  env                Retrieves the current environment, or set a new one.
  filter:check       Check filters for a route.
  help               Displays basic usage information.
  list               Lists the available commands.
  namespaces         Verifies your namespaces are setup correctly.
  publish            Discovers and executes all predefined Publisher classes.
  routes             Displays all routes.
  serve              Launches the CodeIgniter PHP-Development Server.
---
 system/Commands/Generators/CommandGenerator.php | 4 ++--
 tests/system/Commands/CommandGeneratorTest.php  | 4 ++--
 user_guide_src/source/cli/cli_generators.rst    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
index 7ccae13f7163..55755643e949 100644
--- a/system/Commands/Generators/CommandGenerator.php
+++ b/system/Commands/Generators/CommandGenerator.php
@@ -67,7 +67,7 @@ class CommandGenerator extends BaseCommand
     protected $options = [
         '--command'   => 'The command name. Default: "command:name"',
         '--type'      => 'The command type. Options [basic, generator]. Default: "basic".',
-        '--group'     => 'The command group. Default: [basic -> "CodeIgniter", generator -> "Generators"].',
+        '--group'     => 'The command group. Default: [basic -> "App", generator -> "Generators"].',
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
         '--suffix'    => 'Append the component title to the class name (e.g. User => UserCommand).',
         '--force'     => 'Force overwrite existing file.',
@@ -106,7 +106,7 @@ protected function prepare(string $class): string
         }
 
         if (! is_string($group)) {
-            $group = $type === 'generator' ? 'Generators' : 'CodeIgniter';
+            $group = $type === 'generator' ? 'Generators' : 'App';
         }
 
         return $this->parseTemplate(
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 64ab5a21d2d9..aabb86f9a843 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -52,7 +52,7 @@ public function testGenerateCommand(): void
         $file = APPPATH . 'Commands/Deliver.php';
         $this->assertFileExists($file);
         $contents = $this->getFileContents($file);
-        $this->assertStringContainsString('protected $group = \'CodeIgniter\';', $contents);
+        $this->assertStringContainsString('protected $group = \'App\';', $contents);
         $this->assertStringContainsString('protected $name = \'command:name\';', $contents);
     }
 
@@ -72,7 +72,7 @@ public function testGenerateCommandWithOptionTypeBasic(): void
         $file = APPPATH . 'Commands/Deliver.php';
         $this->assertFileExists($file);
         $contents = $this->getFileContents($file);
-        $this->assertStringContainsString('protected $group = \'CodeIgniter\';', $contents);
+        $this->assertStringContainsString('protected $group = \'App\';', $contents);
         $this->assertStringContainsString('protected $name = \'command:name\';', $contents);
     }
 
diff --git a/user_guide_src/source/cli/cli_generators.rst b/user_guide_src/source/cli/cli_generators.rst
index 8636901644f2..e04772f6ab00 100644
--- a/user_guide_src/source/cli/cli_generators.rst
+++ b/user_guide_src/source/cli/cli_generators.rst
@@ -86,7 +86,7 @@ Argument:
 Options:
 ========
 * ``--command``: The command name to run in spark. Defaults to ``command:name``.
-* ``--group``: The group/namespace of the command. Defaults to ``CodeIgniter`` for basic commands, and ``Generators`` for generator commands.
+* ``--group``: The group/namespace of the command. Defaults to ``App`` for basic commands, and ``Generators`` for generator commands.
 * ``--type``: The type of command, whether a ``basic`` command or a ``generator`` command. Defaults to ``basic``.
 * ``--namespace``: Set the root namespace. Defaults to value of ``APP_NAMESPACE``.
 * ``--suffix``: Append the component suffix to the generated class name.

From 543c2a844c94ea0ec445141bdb4ae819de7cc31f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 28 Oct 2023 11:48:52 +0900
Subject: [PATCH 014/380] docs: fix @param array type for Commands

---
 phpstan-baseline.php                          | 50 -------------------
 system/CLI/BaseCommand.php                    | 20 ++++----
 system/Commands/Cache/ClearCache.php          |  2 +-
 system/Commands/Database/Migrate.php          |  2 +-
 system/Commands/Database/MigrateRefresh.php   |  2 +-
 system/Commands/Database/MigrateRollback.php  |  2 +-
 system/Commands/Encryption/GenerateKey.php    |  2 +-
 system/Commands/Generators/CellGenerator.php  |  4 +-
 .../Commands/Generators/CommandGenerator.php  |  4 +-
 .../Commands/Generators/ConfigGenerator.php   |  4 +-
 .../Generators/ControllerGenerator.php        |  4 +-
 .../Commands/Generators/EntityGenerator.php   |  4 +-
 .../Commands/Generators/FilterGenerator.php   |  4 +-
 system/Commands/Generators/MigrateCreate.php  |  4 +-
 .../Generators/MigrationGenerator.php         |  4 +-
 system/Commands/Generators/ModelGenerator.php |  4 +-
 .../Commands/Generators/ScaffoldGenerator.php |  4 +-
 .../Commands/Generators/SeederGenerator.php   |  4 +-
 .../Generators/SessionMigrationGenerator.php  |  2 +-
 .../Generators/ValidationGenerator.php        |  4 +-
 system/Commands/Help.php                      |  4 +-
 system/Commands/Housekeeping/ClearLogs.php    |  2 +-
 system/Commands/ListCommands.php              |  4 +-
 system/Commands/Server/Serve.php              |  4 +-
 system/Commands/Utilities/Environment.php     |  2 +-
 system/Commands/Utilities/FilterCheck.php     |  2 +-
 system/Commands/Utilities/Namespaces.php      |  4 +-
 system/Commands/Utilities/Publish.php         |  2 +-
 system/Commands/Utilities/Routes.php          |  2 +-
 tests/_support/Commands/Unsuffixable.php      |  4 +-
 30 files changed, 55 insertions(+), 105 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 0d372afdb97c..c32d18872464 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -196,16 +196,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Commands/Database/CreateDatabase.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Database\\\\CreateDatabase\\:\\:\\$arguments is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$arguments\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Database/CreateDatabase.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Database\\\\CreateDatabase\\:\\:\\$options is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$options\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Database/CreateDatabase.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -216,11 +206,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Database\\\\MigrateStatus\\:\\:\\$options is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$options\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$params \\(array\\<string, mixed\\>\\) of method CodeIgniter\\\\Commands\\\\Database\\\\MigrateStatus\\:\\:run\\(\\) should be contravariant with parameter \\$params \\(array\\<int\\|string, string\\|null\\>\\) of method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:run\\(\\)$#',
 	'count' => 1,
@@ -231,11 +216,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Commands/Database/Seed.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Database\\\\Seed\\:\\:\\$arguments is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$arguments\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Database/Seed.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showAllTables\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -246,16 +226,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:\\$arguments is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$arguments\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:\\$options is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$options\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset \'encryption\\.key\' directly on \\$_SERVER is discouraged\\.$#',
 	'count' => 1,
@@ -756,26 +726,11 @@
 	'count' => 3,
 	'path' => __DIR__ . '/system/Commands/Utilities/Environment.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Utilities\\\\Environment\\:\\:\\$arguments is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$arguments\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Utilities/Environment.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Utilities\\\\FilterCheck\\:\\:\\$arguments is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$arguments\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Utilities/FilterCheck.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/Commands/Utilities/Namespaces.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Utilities\\\\Publish\\:\\:\\$arguments is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$arguments\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Utilities/Publish.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset \'HTTP_HOST\' directly on \\$_SERVER is discouraged\\.$#',
 	'count' => 1,
@@ -796,11 +751,6 @@
 	'count' => 3,
 	'path' => __DIR__ . '/system/Commands/Utilities/Routes.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string, string\\> of property CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\:\\:\\$options is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$options\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Utilities/Routes.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Implicit array creation is not allowed \\- variable \\$filters might not exist\\.$#',
 	'count' => 1,
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index c4448d56b01a..d837f50dbeef 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -19,14 +19,14 @@
 /**
  * BaseCommand is the base class used in creating CLI commands.
  *
- * @property array           $arguments
- * @property Commands        $commands
- * @property string          $description
- * @property string          $group
- * @property LoggerInterface $logger
- * @property string          $name
- * @property array           $options
- * @property string          $usage
+ * @property array<string, string> $arguments
+ * @property Commands              $commands
+ * @property string                $description
+ * @property string                $group
+ * @property LoggerInterface       $logger
+ * @property string                $name
+ * @property array<string, string> $options
+ * @property string                $usage
  */
 abstract class BaseCommand
 {
@@ -62,14 +62,14 @@ abstract class BaseCommand
     /**
      * the Command's options description
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [];
 
     /**
      * the Command's Arguments description
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [];
 
diff --git a/system/Commands/Cache/ClearCache.php b/system/Commands/Cache/ClearCache.php
index b903425ba795..79fab9dfae3c 100644
--- a/system/Commands/Cache/ClearCache.php
+++ b/system/Commands/Cache/ClearCache.php
@@ -52,7 +52,7 @@ class ClearCache extends BaseCommand
     /**
      * the Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'driver' => 'The cache driver to use',
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index bcf71cade337..119335170d5e 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -53,7 +53,7 @@ class Migrate extends BaseCommand
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '-n'    => 'Set migration namespace',
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
index 689c75424f80..f683219e9d2c 100644
--- a/system/Commands/Database/MigrateRefresh.php
+++ b/system/Commands/Database/MigrateRefresh.php
@@ -52,7 +52,7 @@ class MigrateRefresh extends BaseCommand
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '-n'    => 'Set migration namespace',
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
index c104a81fd9fa..2df223c0f8ad 100644
--- a/system/Commands/Database/MigrateRollback.php
+++ b/system/Commands/Database/MigrateRollback.php
@@ -54,7 +54,7 @@ class MigrateRollback extends BaseCommand
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3',
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index 5837bfb02636..419ae6ef3e34 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -52,7 +52,7 @@ class GenerateKey extends BaseCommand
     /**
      * The command's options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--force'  => 'Force overwrite existing key in `.env` file.',
diff --git a/system/Commands/Generators/CellGenerator.php b/system/Commands/Generators/CellGenerator.php
index cdb819d869f9..cf4757d10eeb 100644
--- a/system/Commands/Generators/CellGenerator.php
+++ b/system/Commands/Generators/CellGenerator.php
@@ -52,7 +52,7 @@ class CellGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The cell class name.',
@@ -61,7 +61,7 @@ class CellGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
index 7ccae13f7163..4b2ec360ad38 100644
--- a/system/Commands/Generators/CommandGenerator.php
+++ b/system/Commands/Generators/CommandGenerator.php
@@ -53,7 +53,7 @@ class CommandGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The command class name.',
@@ -62,7 +62,7 @@ class CommandGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--command'   => 'The command name. Default: "command:name"',
diff --git a/system/Commands/Generators/ConfigGenerator.php b/system/Commands/Generators/ConfigGenerator.php
index 606af47b33f0..a83a9671201d 100644
--- a/system/Commands/Generators/ConfigGenerator.php
+++ b/system/Commands/Generators/ConfigGenerator.php
@@ -52,7 +52,7 @@ class ConfigGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The config class name.',
@@ -61,7 +61,7 @@ class ConfigGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
index f27c77ee0fe5..2cf912b1c7ff 100644
--- a/system/Commands/Generators/ControllerGenerator.php
+++ b/system/Commands/Generators/ControllerGenerator.php
@@ -56,7 +56,7 @@ class ControllerGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The controller class name.',
@@ -65,7 +65,7 @@ class ControllerGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--bare'      => 'Extends from CodeIgniter\Controller instead of BaseController.',
diff --git a/system/Commands/Generators/EntityGenerator.php b/system/Commands/Generators/EntityGenerator.php
index 8cd84785c311..bd20daf59662 100644
--- a/system/Commands/Generators/EntityGenerator.php
+++ b/system/Commands/Generators/EntityGenerator.php
@@ -52,7 +52,7 @@ class EntityGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The entity class name.',
@@ -61,7 +61,7 @@ class EntityGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
diff --git a/system/Commands/Generators/FilterGenerator.php b/system/Commands/Generators/FilterGenerator.php
index 02060b020291..620bee5a9ad4 100644
--- a/system/Commands/Generators/FilterGenerator.php
+++ b/system/Commands/Generators/FilterGenerator.php
@@ -52,7 +52,7 @@ class FilterGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The filter class name.',
@@ -61,7 +61,7 @@ class FilterGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
diff --git a/system/Commands/Generators/MigrateCreate.php b/system/Commands/Generators/MigrateCreate.php
index 0b4935342831..a2fa6bf76667 100644
--- a/system/Commands/Generators/MigrateCreate.php
+++ b/system/Commands/Generators/MigrateCreate.php
@@ -55,7 +55,7 @@ class MigrateCreate extends BaseCommand
     /**
      * The Command's arguments.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The migration file name.',
@@ -64,7 +64,7 @@ class MigrateCreate extends BaseCommand
     /**
      * The Command's options.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Defaults to APP_NAMESPACE',
diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
index 82428a6948b3..52f9e6e53535 100644
--- a/system/Commands/Generators/MigrationGenerator.php
+++ b/system/Commands/Generators/MigrationGenerator.php
@@ -56,7 +56,7 @@ class MigrationGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The migration class name.',
@@ -65,7 +65,7 @@ class MigrationGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--session'   => 'Generates the migration file for database sessions.',
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
index eb0a1aa9802f..f4946a9441c9 100644
--- a/system/Commands/Generators/ModelGenerator.php
+++ b/system/Commands/Generators/ModelGenerator.php
@@ -53,7 +53,7 @@ class ModelGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The model class name.',
@@ -62,7 +62,7 @@ class ModelGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--table'     => 'Supply a table name. Default: "the lowercased plural of the class name".',
diff --git a/system/Commands/Generators/ScaffoldGenerator.php b/system/Commands/Generators/ScaffoldGenerator.php
index 351ee009459e..ef34b92ed572 100644
--- a/system/Commands/Generators/ScaffoldGenerator.php
+++ b/system/Commands/Generators/ScaffoldGenerator.php
@@ -53,7 +53,7 @@ class ScaffoldGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The class name',
@@ -62,7 +62,7 @@ class ScaffoldGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--bare'      => 'Add the "--bare" option to controller component.',
diff --git a/system/Commands/Generators/SeederGenerator.php b/system/Commands/Generators/SeederGenerator.php
index 09a1037f0bdc..e60525ae0d57 100644
--- a/system/Commands/Generators/SeederGenerator.php
+++ b/system/Commands/Generators/SeederGenerator.php
@@ -52,7 +52,7 @@ class SeederGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The seeder class name.',
@@ -61,7 +61,7 @@ class SeederGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
diff --git a/system/Commands/Generators/SessionMigrationGenerator.php b/system/Commands/Generators/SessionMigrationGenerator.php
index a04527e866d1..cb7da5892780 100644
--- a/system/Commands/Generators/SessionMigrationGenerator.php
+++ b/system/Commands/Generators/SessionMigrationGenerator.php
@@ -59,7 +59,7 @@ class SessionMigrationGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '-t' => 'Supply a table name.',
diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
index 0c58ca5b0866..1b2efb8db18a 100644
--- a/system/Commands/Generators/ValidationGenerator.php
+++ b/system/Commands/Generators/ValidationGenerator.php
@@ -52,7 +52,7 @@ class ValidationGenerator extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'The validation class name.',
@@ -61,7 +61,7 @@ class ValidationGenerator extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index 74dcbeab855a..338a5c868c72 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -53,7 +53,7 @@ class Help extends BaseCommand
     /**
      * the Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'command_name' => 'The command name [default: "help"]',
@@ -62,7 +62,7 @@ class Help extends BaseCommand
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [];
 
diff --git a/system/Commands/Housekeeping/ClearLogs.php b/system/Commands/Housekeeping/ClearLogs.php
index eb2489c5ea72..56cfeab36ae7 100644
--- a/system/Commands/Housekeeping/ClearLogs.php
+++ b/system/Commands/Housekeeping/ClearLogs.php
@@ -51,7 +51,7 @@ class ClearLogs extends BaseCommand
     /**
      * The Command's options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--force' => 'Force delete of all logs files without prompting.',
diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
index 0c808322af6a..9accecf0ad79 100644
--- a/system/Commands/ListCommands.php
+++ b/system/Commands/ListCommands.php
@@ -54,14 +54,14 @@ class ListCommands extends BaseCommand
     /**
      * the Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [];
 
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--simple' => 'Prints a list of the commands with no other info',
diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
index 2dc9e5ddc8d8..b53820205fba 100644
--- a/system/Commands/Server/Serve.php
+++ b/system/Commands/Server/Serve.php
@@ -54,7 +54,7 @@ class Serve extends BaseCommand
     /**
      * Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [];
 
@@ -75,7 +75,7 @@ class Serve extends BaseCommand
     /**
      * Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '--php'  => 'The PHP Binary [default: "PHP_BINARY"]',
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
index b844e7a260f2..fd8f68fabdbd 100644
--- a/system/Commands/Utilities/Environment.php
+++ b/system/Commands/Utilities/Environment.php
@@ -62,7 +62,7 @@ final class Environment extends BaseCommand
     /**
      * The Command's options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [];
 
diff --git a/system/Commands/Utilities/FilterCheck.php b/system/Commands/Utilities/FilterCheck.php
index d2eb2fb728a4..38dbe8b4bc8d 100644
--- a/system/Commands/Utilities/FilterCheck.php
+++ b/system/Commands/Utilities/FilterCheck.php
@@ -63,7 +63,7 @@ class FilterCheck extends BaseCommand
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [];
 
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
index ef37736c56b8..71461933c5a0 100644
--- a/system/Commands/Utilities/Namespaces.php
+++ b/system/Commands/Utilities/Namespaces.php
@@ -57,14 +57,14 @@ class Namespaces extends BaseCommand
     /**
      * the Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [];
 
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [
         '-c' => 'Show only CodeIgniter config namespaces.',
diff --git a/system/Commands/Utilities/Publish.php b/system/Commands/Utilities/Publish.php
index cfed0472c439..1e4103c114d8 100644
--- a/system/Commands/Utilities/Publish.php
+++ b/system/Commands/Utilities/Publish.php
@@ -63,7 +63,7 @@ class Publish extends BaseCommand
     /**
      * the Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [];
 
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index b3693ec6860e..5d20da07d514 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -61,7 +61,7 @@ class Routes extends BaseCommand
     /**
      * the Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [];
 
diff --git a/tests/_support/Commands/Unsuffixable.php b/tests/_support/Commands/Unsuffixable.php
index cf906071d7ef..087dc558fdc0 100644
--- a/tests/_support/Commands/Unsuffixable.php
+++ b/tests/_support/Commands/Unsuffixable.php
@@ -49,7 +49,7 @@ class Unsuffixable extends BaseCommand
     /**
      * The Command's Arguments
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $arguments = [
         'name' => 'Class name',
@@ -58,7 +58,7 @@ class Unsuffixable extends BaseCommand
     /**
      * The Command's Options
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $options = [];
 

From 7c63e51aebe76034f42cf1bb1f5d10e09d299845 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sat, 28 Oct 2023 12:59:11 +0200
Subject: [PATCH 015/380] remove the double slash from the URL

---
 system/Debug/Toolbar/Views/toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index 073a76ab4312..cd0b05581e2a 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -650,7 +650,7 @@ var ciDebugBar = {
     },
 
     hotReloadConnect: function () {
-        const eventSource = new EventSource(ciSiteURL + "/__hot-reload");
+        const eventSource = new EventSource(ciSiteURL + "__hot-reload");
 
         eventSource.addEventListener("reload", function (e) {
             console.log("reload", e);

From cdda18dd8090a03d9c5b166b46c7d4e10da8e96b Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sat, 28 Oct 2023 12:59:28 +0200
Subject: [PATCH 016/380] close session ASAP if active

---
 system/HotReloader/HotReloader.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/HotReloader/HotReloader.php b/system/HotReloader/HotReloader.php
index 564ba544283a..579bcd4ac598 100644
--- a/system/HotReloader/HotReloader.php
+++ b/system/HotReloader/HotReloader.php
@@ -18,6 +18,10 @@ final class HotReloader
 {
     public function run(): void
     {
+        if (session_status() === PHP_SESSION_ACTIVE) {
+            session_write_close();
+        }
+
         ini_set('zlib.output_compression', 'Off');
 
         header('Cache-Control: no-store');

From ca13b97df73c69d95e814eabcb1235e9a1d362bb Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 27 Oct 2023 23:29:18 +0800
Subject: [PATCH 017/380] fix: add correct array signatures for Modules

---
 app/Config/Modules.php     | 4 ++--
 phpstan-baseline.php       | 5 -----
 system/Modules/Modules.php | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/Config/Modules.php b/app/Config/Modules.php
index f84580c856d3..8d4bf56544b0 100644
--- a/app/Config/Modules.php
+++ b/app/Config/Modules.php
@@ -58,7 +58,7 @@ class Modules extends BaseModules
      *       ],
      *   ]
      *
-     * @var array
+     * @var array{only?: list<string>, exclude?: list<string>}
      */
     public $composerPackages = [];
 
@@ -72,7 +72,7 @@ class Modules extends BaseModules
      *
      * If it is not listed, only the base application elements will be used.
      *
-     * @var string[]
+     * @var list<string>
      */
     public $aliases = [
         'events',
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index cfde40738834..34add57538ac 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -1,11 +1,6 @@
 <?php declare(strict_types = 1);
 
 $ignoreErrors = [];
-$ignoreErrors[] = [
-	'message' => '#^PHPDoc type array\\<string\\> of property Config\\\\Modules\\:\\:\\$aliases is not the same as PHPDoc type array of overridden property CodeIgniter\\\\Modules\\\\Modules\\:\\:\\$aliases\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/app/Config/Modules.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^PHPDoc type CodeIgniter\\\\HTTP\\\\CLIRequest\\|CodeIgniter\\\\HTTP\\\\IncomingRequest of property App\\\\Controllers\\\\BaseController\\:\\:\\$request is not the same as PHPDoc type CodeIgniter\\\\HTTP\\\\RequestInterface of overridden property CodeIgniter\\\\Controller\\:\\:\\$request\\.$#',
 	'count' => 1,
diff --git a/system/Modules/Modules.php b/system/Modules/Modules.php
index f99e7215e733..e17b9f3c2415 100644
--- a/system/Modules/Modules.php
+++ b/system/Modules/Modules.php
@@ -37,7 +37,7 @@ class Modules
     /**
      * Auto-Discover Rules Handler
      *
-     * @var array
+     * @var list<string>
      */
     public $aliases = [];
 

From e2ed766d4c8592b997c02adef1a0e348288933f2 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sat, 28 Oct 2023 15:42:22 +0200
Subject: [PATCH 018/380] update ciSiteURL

---
 system/Debug/Toolbar/Views/toolbar.js      | 2 +-
 system/Debug/Toolbar/Views/toolbar.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index cd0b05581e2a..073a76ab4312 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -650,7 +650,7 @@ var ciDebugBar = {
     },
 
     hotReloadConnect: function () {
-        const eventSource = new EventSource(ciSiteURL + "__hot-reload");
+        const eventSource = new EventSource(ciSiteURL + "/__hot-reload");
 
         eventSource.addEventListener("reload", function (e) {
             console.log("reload", e);
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 6e62340c6ded..aadf72ee19ad 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -23,7 +23,7 @@
 </style>
 
 <script id="toolbar_js">
-    var ciSiteURL = "<?= site_url() ?>"
+    var ciSiteURL = "<?= rtrim(site_url(), '/') ?>"
     <?= file_get_contents(__DIR__ . '/toolbar.js') ?>
 </script>
 <div id="debug-icon" class="debug-bar-ndisplay">

From f701ccebb4a7d0a5b232f498f984c0dc7b88fa98 Mon Sep 17 00:00:00 2001
From: Pieter Gerets <123326988+pieter-gerets@users.noreply.github.com>
Date: Sat, 28 Oct 2023 19:42:11 +0200
Subject: [PATCH 019/380] Fix typo

---
 user_guide_src/source/libraries/validation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 36a7e4912283..0288090b6f6f 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -565,7 +565,7 @@ or the value that was validated you can add the ``{field}``, ``{param}`` and ``{
 On a field with the human name Username and a rule of ``min_length[6]`` with a value of "Pizza", an error would display: "Supplied value (Pizza) for Username must have
 at least 6 characters."
 
-.. warning:: If you get the error messages with ``getErrors()`` or ``getError()``, the messages are not HTML escaped. If you use user input data like ``({value})`` to make the error message, it might contain HTML tags. If you don't escape the messages before displying them, XSS attacks are possible.
+.. warning:: If you get the error messages with ``getErrors()`` or ``getError()``, the messages are not HTML escaped. If you use user input data like ``({value})`` to make the error message, it might contain HTML tags. If you don't escape the messages before displaying them, XSS attacks are possible.
 
 .. note:: When using label-style error messages, if you pass the second parameter to ``setRules()``, it will be overwritten with the value of the first parameter.
 

From df30b5bf2d137a286151f40f5aa261958ac73527 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 Oct 2023 10:10:34 +0900
Subject: [PATCH 020/380] docs: change filter alias

We use `auth-rates` or `force-reset` in Shield.
---
 user_guide_src/source/incoming/filters/004.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/filters/004.php b/user_guide_src/source/incoming/filters/004.php
index 304bd21b53eb..fbaa8358ad60 100644
--- a/user_guide_src/source/incoming/filters/004.php
+++ b/user_guide_src/source/incoming/filters/004.php
@@ -7,7 +7,7 @@
 class Filters extends BaseConfig
 {
     public array $aliases = [
-        'apiPrep' => [
+        'api-prep' => [
             \App\Filters\Negotiate::class,
             \App\Filters\ApiAuth::class,
         ],

From 2b9ffe28fbbcbe894d0cfd3d3dfb89cbe2c0f8fb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 Oct 2023 10:11:25 +0900
Subject: [PATCH 021/380] docs: fix incorrect filter alias

---
 user_guide_src/source/incoming/filters/008.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php
index 945e9498b4f9..8d417fd436aa 100644
--- a/user_guide_src/source/incoming/filters/008.php
+++ b/user_guide_src/source/incoming/filters/008.php
@@ -9,7 +9,7 @@ class Filters extends BaseConfig
     // ...
 
     public array $methods = [
-        'post' => ['InvalidChars', 'csrf'],
+        'post' => ['invalidchars', 'csrf'],
         'get'  => ['csrf'],
     ];
 

From 6e85e2c80cd7c72854c57352367c3887944a95f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 Oct 2023 10:11:49 +0900
Subject: [PATCH 022/380] docs: add empty lines

---
 user_guide_src/source/incoming/filters.rst | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 3965dce51b0e..f6fea6551c37 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -121,7 +121,9 @@ $globals
 
 The second section allows you to define any filters that should be applied to every request made by the framework.
 You should take care with how many you use here, since it could have performance implications to have too many
-run on every request. Filters can be specified by adding their alias to either the before or after array:
+run on every request.
+
+Filters can be specified by adding their alias to either the ``before`` or ``after`` array:
 
 .. literalinclude:: filters/005.php
 
@@ -130,14 +132,18 @@ Except for a Few URIs
 
 There are times where you want to apply a filter to almost every request, but have a few that should be left alone.
 One common example is if you need to exclude a few URI's from the CSRF protection filter to allow requests from
-third-party websites to hit one or two specific URI's, while keeping the rest of them protected. To do this, add
+third-party websites to hit one or two specific URI's, while keeping the rest of them protected.
+
+To do this, add
 an array with the ``except`` key and a URI path (relative to BaseURL) to match as the value alongside the alias:
 
 .. literalinclude:: filters/006.php
 
 Any place you can use a URI path (relative to BaseURL) in the filter settings, you can use a regular expression or, like in this example, use
 an asterisk (``*``) for a wildcard that will match all characters after that. In this example, any URI path starting with ``api/``
-would be exempted from CSRF protection, but the site's forms would all be protected. If you need to specify multiple
+would be exempted from CSRF protection, but the site's forms would all be protected.
+
+If you need to specify multiple
 URI paths, you can use an array of URI path patterns:
 
 .. literalinclude:: filters/007.php

From 97c3f7704cde3d9cc1fa66283683c31017f7d54e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 Oct 2023 10:17:42 +0900
Subject: [PATCH 023/380] docs: add "valid"

Because controller filters are applied before controller execution.
If there is no controller found, the filters are not applied.
---
 user_guide_src/source/incoming/filters.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index f6fea6551c37..29462ccc6538 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -119,7 +119,8 @@ You should define as many aliases as you need.
 $globals
 ========
 
-The second section allows you to define any filters that should be applied to every request made by the framework.
+The second section allows you to define any filters that should be applied to every valid request made by the framework.
+
 You should take care with how many you use here, since it could have performance implications to have too many
 run on every request.
 

From 1a921c9c24673caab7d100e7aa3d991f4187e0c9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 Oct 2023 10:22:07 +0900
Subject: [PATCH 024/380] fix: typo in help message

---
 system/Commands/Utilities/FilterCheck.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Commands/Utilities/FilterCheck.php b/system/Commands/Utilities/FilterCheck.php
index 38dbe8b4bc8d..1b9937d22a89 100644
--- a/system/Commands/Utilities/FilterCheck.php
+++ b/system/Commands/Utilities/FilterCheck.php
@@ -57,7 +57,7 @@ class FilterCheck extends BaseCommand
      */
     protected $arguments = [
         'method' => 'The HTTP method. get, post, put, etc.',
-        'route'  => 'The route (URI path) to check filtes.',
+        'route'  => 'The route (URI path) to check filters.',
     ];
 
     /**

From 339d5276ab1212e85ab252276e5bcf2d22356d17 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 28 Oct 2023 21:52:04 +0800
Subject: [PATCH 025/380] Use native PHPDocs instead of `@phpstan-`

---
 app/Config/App.php                            |  3 +-
 app/Config/Autoload.php                       |  9 ++--
 app/Config/Cache.php                          |  3 +-
 app/Config/Filters.php                        |  8 ++--
 app/Config/Kint.php                           |  9 ++--
 app/Config/Session.php                        |  2 +-
 phpstan-baseline.php                          |  5 +++
 system/Autoloader/Autoloader.php              | 11 ++---
 system/BaseModel.php                          |  3 +-
 system/Cache/Handlers/BaseHandler.php         |  7 ++-
 system/Cache/Handlers/FileHandler.php         |  3 +-
 system/Commands/Database/ShowTableInfo.php    |  2 +-
 .../Utilities/Routes/AutoRouteCollector.php   |  3 +-
 .../AutoRouterImproved/AutoRouteCollector.php |  3 +-
 .../ControllerMethodReader.php                | 12 +++--
 .../Utilities/Routes/ControllerFinder.php     |  5 +--
 .../Routes/ControllerMethodReader.php         |  7 ++-
 system/Common.php                             |  2 +-
 system/Config/AutoloadConfig.php              |  6 +--
 system/Config/Factories.php                   | 13 +++---
 system/Database/BaseBuilder.php               | 44 +++++++------------
 system/Database/Config.php                    |  9 ++--
 system/Database/Forge.php                     |  4 +-
 system/Database/SQLite3/Table.php             |  3 +-
 system/Database/Seeder.php                    |  3 +-
 system/Debug/Exceptions.php                   |  3 --
 system/Debug/Iterator.php                     |  2 +-
 system/Debug/Timer.php                        |  4 +-
 system/Debug/Toolbar.php                      |  1 -
 system/Debug/Toolbar/Collectors/Database.php  |  1 -
 system/Email/Email.php                        |  3 +-
 system/Entity/Entity.php                      |  3 +-
 system/Filters/Filters.php                    |  9 ++--
 system/Helpers/kint_helper.php                |  2 +-
 system/Log/Logger.php                         |  3 +-
 system/Router/AutoRouterImproved.php          |  6 +--
 system/Router/DefinedRouteCollector.php       |  2 +-
 system/Router/RouteCollection.php             | 15 +++----
 system/Test/CIUnitTestCase.php                |  3 +-
 tests/system/AutoReview/FrameworkCodeTest.php |  2 +-
 tests/system/Autoloader/AutoloaderTest.php    |  2 +-
 tests/system/Cache/ResponseCacheTest.php      |  2 +-
 42 files changed, 94 insertions(+), 148 deletions(-)

diff --git a/app/Config/App.php b/app/Config/App.php
index 186bfa86bb02..6ae678625e7b 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -27,8 +27,7 @@ class App extends BaseConfig
      *      'http://accounts.example.com/':
      *          ['media.example.com', 'accounts.example.com']
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     public array $allowedHostnames = [];
 
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index 22f05ecdab26..7a4602d72920 100644
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -41,8 +41,7 @@ class Autoload extends AutoloadConfig
      *       'App'         => APPPATH
      *   ];
      *
-     * @var array<string, array<int, string>|string>
-     * @phpstan-var array<string, string|list<string>>
+     * @var array<string, list<string>|string>
      */
     public $psr4 = [
         APP_NAMESPACE => APPPATH, // For custom app namespace
@@ -81,8 +80,7 @@ class Autoload extends AutoloadConfig
      *       '/path/to/my/file.php',
      *   ];
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     public $files = [];
 
@@ -95,8 +93,7 @@ class Autoload extends AutoloadConfig
      *       'form',
      *   ];
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     public $helpers = [];
 }
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
index 61cdd50de890..b5b2cdc1738f 100644
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -158,8 +158,7 @@ class Cache extends BaseConfig
      * This is an array of cache engine alias' and class names. Only engines
      * that are listed here are allowed to be used.
      *
-     * @var array<string, string>
-     * @phpstan-var array<string, class-string<CacheInterface>>
+     * @var array<string, class-string<CacheInterface>>
      */
     public array $validHandlers = [
         'dummy'     => DummyHandler::class,
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index 41e76267a448..ac37b414c45c 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -15,9 +15,8 @@ class Filters extends BaseConfig
      * Configures aliases for Filter classes to
      * make reading things nicer and simpler.
      *
-     * @var array<string, array<int, string>|string> [filter_name => classname]
-     *                                               or [filter_name => [classname1, classname2, ...]]
-     * @phpstan-var array<string, class-string|list<class-string>>
+     * @var array<string, class-string|list<class-string>> [filter_name => classname]
+     *                                                     or [filter_name => [classname1, classname2, ...]]
      */
     public array $aliases = [
         'csrf'          => CSRF::class,
@@ -31,8 +30,7 @@ class Filters extends BaseConfig
      * List of filter aliases that are always
      * applied before and after every request.
      *
-     * @var array<string, array<string, array<string, string>>>|array<string, array<string>>
-     * @phpstan-var array<string, list<string>>|array<string, array<string, array<string, string>>>
+     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
      */
     public array $globals = [
         'before' => [
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
index cc8b54592b6b..77aeb08f1432 100644
--- a/app/Config/Kint.php
+++ b/app/Config/Kint.php
@@ -27,8 +27,7 @@ class Kint extends BaseConfig
     */
 
     /**
-     * @var array<int, ConstructablePluginInterface|string>
-     * @phpstan-var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>
+     * @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>
      */
     public $plugins;
 
@@ -46,14 +45,12 @@ class Kint extends BaseConfig
     public int $richSort     = AbstractRenderer::SORT_FULL;
 
     /**
-     * @var array<string, string>
-     * @phpstan-var array<string, class-string<ValuePluginInterface>>
+     * @var array<string, class-string<ValuePluginInterface>>
      */
     public $richObjectPlugins;
 
     /**
-     * @var array<string, string>
-     * @phpstan-var array<string, class-string<TabPluginInterface>>
+     * @var array<string, class-string<TabPluginInterface>>
      */
     public $richTabPlugins;
 
diff --git a/app/Config/Session.php b/app/Config/Session.php
index ea834805e5a6..e077df64bd46 100644
--- a/app/Config/Session.php
+++ b/app/Config/Session.php
@@ -19,7 +19,7 @@ class Session extends BaseConfig
      * - `CodeIgniter\Session\Handlers\MemcachedHandler`
      * - `CodeIgniter\Session\Handlers\RedisHandler`
      *
-     * @phpstan-var class-string<BaseHandler>
+     * @var class-string<BaseHandler>
      */
     public string $driver = FileHandler::class;
 
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index cfde40738834..6071e62e3785 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -16,6 +16,11 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
 ];
+$ignoreErrors[] = [
+	'message' => '#^Property Config\\\\Autoload\\:\\:\\$helpers \\(array\\<int, string\\>\\) in isset\\(\\) is not nullable\\.$#',
+	'count' => 1,
+	'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
+];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 13,
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index ecfd92b5ef8b..ca886fb535bf 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -75,8 +75,7 @@ class Autoloader
     /**
      * Stores files as a list.
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     protected $files = [];
 
@@ -84,8 +83,7 @@ class Autoloader
      * Stores helper list.
      * Always load the URL helper, it should be used in most apps.
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     protected $helpers = ['url'];
 
@@ -119,7 +117,7 @@ public function initialize(Autoload $config, Modules $modules)
             $this->files = $config->files;
         }
 
-        if (isset($config->helpers)) { // @phpstan-ignore-line
+        if (isset($config->helpers)) {
             $this->helpers = [...$this->helpers, ...$config->helpers];
         }
 
@@ -185,8 +183,7 @@ public function unregister(): void
     /**
      * Registers namespaces with the autoloader.
      *
-     * @param array<string, array<int, string>|string>|string $namespace
-     * @phpstan-param array<string, list<string>|string>|string $namespace
+     * @param array<string, list<string>|string>|string $namespace
      *
      * @return $this
      */
diff --git a/system/BaseModel.php b/system/BaseModel.php
index c27afd027423..80baaf3fb024 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -63,8 +63,7 @@ abstract class BaseModel
      * The Database connection group that
      * should be instantiated.
      *
-     * @var string|null
-     * @phpstan-var non-empty-string|null
+     * @var non-empty-string|null
      */
     protected $DBGroup;
 
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index c12b330bc469..061a4a661b8a 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -76,10 +76,9 @@ public static function validateKey($key, $prefix = ''): string
     /**
      * Get an item from the cache, or execute the given Closure and store the result.
      *
-     * @param string  $key      Cache item name
-     * @param int     $ttl      Time to live
-     * @param Closure $callback Callback return value
-     * @phpstan-param Closure(): mixed $callback
+     * @param string           $key      Cache item name
+     * @param int              $ttl      Time to live
+     * @param Closure(): mixed $callback Callback return value
      *
      * @return array|bool|float|int|object|string|null
      */
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index e22543d27891..54cafdc5f35b 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -222,8 +222,7 @@ public function isSupported(): bool
      * Does the heavy lifting of actually retrieving the file and
      * verifying it's age.
      *
-     * @return array<string, mixed>|false
-     * @phpstan-return array{data: mixed, ttl: int, time: int}|false
+     * @return array{data: mixed, ttl: int, time: int}|false
      */
     protected function getItem(string $filename)
     {
diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 07aa60c961ca..f955c6b27011 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -84,7 +84,7 @@ class ShowTableInfo extends BaseCommand
     ];
 
     /**
-     * @phpstan-var  list<list<string|int>> Table Data.
+     * @var list<list<int|string>> Table Data.
      */
     private array $tbody;
 
diff --git a/system/Commands/Utilities/Routes/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouteCollector.php
index ee331332291b..cc45608f21e8 100644
--- a/system/Commands/Utilities/Routes/AutoRouteCollector.php
+++ b/system/Commands/Utilities/Routes/AutoRouteCollector.php
@@ -37,8 +37,7 @@ public function __construct(string $namespace, string $defaultController, string
     }
 
     /**
-     * @return array<int, array<int, string>>
-     * @phpstan-return list<list<string>>
+     * @return list<list<string>>
      */
     public function get(): array
     {
diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
index 0b9089ce2ade..18a158cffa4f 100644
--- a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
@@ -62,8 +62,7 @@ public function __construct(
     }
 
     /**
-     * @return array<int, array<int, string>>
-     * @phpstan-return list<list<string>>
+     * @return list<list<string>>
      */
     public function get(): array
     {
diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
index a8b6912d4bf7..6b865226d626 100644
--- a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
@@ -27,8 +27,7 @@ final class ControllerMethodReader
     private string $namespace;
 
     /**
-     * @var array<int, string>
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     private array $httpMethods;
 
@@ -44,10 +43,9 @@ public function __construct(string $namespace, array $httpMethods)
     /**
      * Returns found route info in the controller.
      *
-     * @phpstan-param class-string $class
+     * @param class-string $class
      *
-     * @return array<int, array<string, array|string>>
-     * @phpstan-return list<array<string, string|array>>
+     * @return list<array<string, array|string>>
      */
     public function read(string $class, string $defaultController = 'Home', string $defaultMethod = 'index'): array
     {
@@ -154,7 +152,7 @@ private function getParameters(ReflectionMethod $method): array
     }
 
     /**
-     * @phpstan-param class-string $classname
+     * @param class-string $classname
      *
      * @return string URI path part from the folder(s) and controller
      */
@@ -179,7 +177,7 @@ private function getUriByClass(string $classname): string
     /**
      * Gets a route for the default controller.
      *
-     * @phpstan-return list<array>
+     * @return list<array>
      */
     private function getRouteForDefaultController(
         string $classShortname,
diff --git a/system/Commands/Utilities/Routes/ControllerFinder.php b/system/Commands/Utilities/Routes/ControllerFinder.php
index f801d531fa92..3982c454a78e 100644
--- a/system/Commands/Utilities/Routes/ControllerFinder.php
+++ b/system/Commands/Utilities/Routes/ControllerFinder.php
@@ -38,8 +38,7 @@ public function __construct(string $namespace)
     }
 
     /**
-     * @return string[]
-     * @phpstan-return class-string[]
+     * @return class-string[]
      */
     public function find(): array
     {
@@ -66,7 +65,7 @@ public function find(): array
                 $classnameOrEmpty = $this->locator->getClassname($file);
 
                 if ($classnameOrEmpty !== '') {
-                    /** @phpstan-var class-string $classname */
+                    /** @var class-string $classname */
                     $classname = $classnameOrEmpty;
 
                     $classes[] = $classname;
diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index eb0152dec623..31bcde12dfb8 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -35,10 +35,9 @@ public function __construct(string $namespace)
     }
 
     /**
-     * @phpstan-param class-string $class
+     * @param class-string $class
      *
-     * @return array<int, array{route: string, handler: string}>
-     * @phpstan-return list<array{route: string, handler: string}>
+     * @return list<array{route: string, handler: string}>
      */
     public function read(string $class, string $defaultController = 'Home', string $defaultMethod = 'index'): array
     {
@@ -128,7 +127,7 @@ private function hasRemap(ReflectionClass $class): bool
     }
 
     /**
-     * @phpstan-param class-string $classname
+     * @param class-string $classname
      *
      * @return string URI path part from the folder(s) and controller
      */
diff --git a/system/Common.php b/system/Common.php
index 80dca72c74e3..9ad7fe5b842b 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1139,7 +1139,7 @@ function stringify_attributes($attributes, bool $js = false): string
      * returns its return value if any.
      * Otherwise will start or stop the timer intelligently.
      *
-     * @phpstan-param (callable(): mixed)|null $callable
+     * @param (callable(): mixed)|null $callable
      *
      * @return Timer
      */
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index da08dd6f6640..33c977cc0bb6 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -45,8 +45,7 @@ class AutoloadConfig
      * but this should be done prior to creating any namespaced classes,
      * else you will need to modify all of those classes for this to work.
      *
-     * @var array<string, array<int, string>|string>
-     * @phpstan-var array<string, string|list<string>>
+     * @var array<string, list<string>|string>
      */
     public $psr4 = [];
 
@@ -72,8 +71,7 @@ class AutoloadConfig
      * that will be autoloaded. This can be useful for bootstrap operations
      * or for loading functions.
      *
-     * @var array<int, string>
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     public $files = [];
 
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 8eb68b0d3643..c86bfd95cc5d 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -62,8 +62,7 @@ class Factories
      *
      * [component => [alias => FQCN]]
      *
-     * @var array<string, array<string, string>>
-     * @phpstan-var array<string, array<string, class-string>>
+     * @var array<string, array<string, class-string>>
      */
     protected static $aliases = [];
 
@@ -76,8 +75,7 @@ class Factories
      *
      * [component => [FQCN => instance]]
      *
-     * @var array<string, array<string, object>>
-     * @phpstan-var  array<string, array<class-string, object>>
+     * @var array<string, array<class-string, object>>
      */
     protected static $instances = [];
 
@@ -93,10 +91,9 @@ class Factories
     /**
      * Define the class to load. You can *override* the concrete class.
      *
-     * @param string $component Lowercase, plural component name
-     * @param string $alias     Class alias. See the $aliases property.
-     * @param string $classname FQCN to be loaded
-     * @phpstan-param class-string $classname FQCN to be loaded
+     * @param string       $component Lowercase, plural component name
+     * @param string       $alias     Class alias. See the $aliases property.
+     * @param class-string $classname FQCN to be loaded
      */
     public static function define(string $component, string $alias, string $classname): void
     {
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 302020323577..12bd14f73ab1 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -88,8 +88,7 @@ class BaseBuilder
      * QB keys
      * list of column names.
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     protected $QBKeys = [];
 
@@ -131,8 +130,7 @@ class BaseBuilder
     /**
      * QB data sets
      *
-     * @var array[]|string[]
-     * @phpstan-var array<string, string>|list<list<string|int>>
+     * @var array<string, string>|list<list<int|string>>
      */
     protected $QBSet = [];
 
@@ -164,7 +162,7 @@ class BaseBuilder
      * Holds additional options and data used to render SQL
      * and is reset by resetWrite()
      *
-     * @phpstan-var array{
+     * @var array{
      *   updateFieldsAdditional?: array,
      *   tableIdentity?: string,
      *   updateFields?: array,
@@ -173,7 +171,6 @@ class BaseBuilder
      *   sql?: string,
      *   alias?: string
      * }
-     * @var array
      */
     protected $QBOptions;
 
@@ -1967,11 +1964,9 @@ public function upsertBatch($set = null, ?bool $escape = null, int $batchSize =
      *
      * @used-by batchExecute
      *
-     * @param string   $table Protected table name
-     * @param string[] $keys  QBKeys
-     * @phpstan-param list<string> $keys QBKeys
-     * @param array<array<int|string>> $values QBSet
-     * @phpstan-param list<list<string|int>> $values QBSet
+     * @param string                 $table  Protected table name
+     * @param list<string>           $keys   QBKeys
+     * @param list<list<int|string>> $values QBSet
      */
     protected function _upsertBatch(string $table, array $keys, array $values): string
     {
@@ -2196,11 +2191,9 @@ public function insertBatch($set = null, ?bool $escape = null, int $batchSize =
      *
      * @used-by batchExecute
      *
-     * @param string   $table Protected table name
-     * @param string[] $keys  QBKeys
-     * @phpstan-param list<string> $keys QBKeys
-     * @param array<array<int|string>> $values QBSet
-     * @phpstan-param list<list<string|int>> $values QBSet
+     * @param string                 $table  Protected table name
+     * @param list<string>           $keys   QBKeys
+     * @param list<list<int|string>> $values QBSet
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
@@ -2566,11 +2559,9 @@ public function updateBatch($set = null, $constraints = null, int $batchSize = 1
      *
      * @used-by batchExecute
      *
-     * @param string   $table Protected table name
-     * @param string[] $keys  QBKeys
-     * @phpstan-param list<string> $keys QBKeys
-     * @param array[] $values QBSet
-     * @phpstan-param list<list<string|int>> $values QBSet
+     * @param string                 $table  Protected table name
+     * @param list<string>           $keys   QBKeys
+     * @param list<list<int|string>> $values QBSet
      */
     protected function _updateBatch(string $table, array $keys, array $values): string
     {
@@ -2830,11 +2821,9 @@ public function deleteBatch($set = null, $constraints = null, int $batchSize = 1
      *
      * @used-by batchExecute
      *
-     * @param string   $table Protected table name
-     * @param string[] $keys  QBKeys
-     * @phpstan-param list<string> $keys QBKeys
-     * @param array<array<int|string>> $values QBSet
-     * @phpstan-param list<list<string|int>> $values QBSet
+     * @param string       $table Protected table name
+     * @param list<string> $keys  QBKeys
+     * @paramst<string|int>> $values QBSet
      */
     protected function _deleteBatch(string $table, array $keys, array $values): string
     {
@@ -3412,8 +3401,7 @@ protected function getOperator(string $str, bool $list = false)
     /**
      * Returns the SQL string operator from where key
      *
-     * @return array<int, string>|false
-     * @phpstan-return list<string>|false
+     * @return false|list<string>
      */
     private function getOperatorFromWhereKey(string $whereKey)
     {
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 62fa79202d26..92556c6d8fef 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -41,10 +41,9 @@ class Config extends BaseConfig
     /**
      * Returns the database connection
      *
-     * @param array|BaseConnection|string|null $group The name of the connection group to use,
-     *                                                or an array of configuration settings.
-     * @phpstan-param array|BaseConnection|non-empty-string|null $group
-     * @param bool $getShared Whether to return a shared instance of the connection.
+     * @param array|BaseConnection|non-empty-string|null $group     The name of the connection group to use,
+     *                                                              or an array of configuration settings.
+     * @param bool                                       $getShared Whether to return a shared instance of the connection.
      *
      * @return BaseConnection
      */
@@ -127,7 +126,7 @@ public static function utils($group = null)
     /**
      * Returns a new instance of the Database Seeder.
      *
-     * @phpstan-param null|non-empty-string $group
+     * @param non-empty-string|null $group
      *
      * @return Seeder
      */
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index ae26f6e7457d..57e43bf199fe 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -39,7 +39,7 @@ class Forge
     /**
      * List of keys.
      *
-     * @phpstan-var array{}|list<array{fields: string[], keyName: string}>
+     * @var list<array{fields?: string[], keyName?: string}>
      */
     protected $keys = [];
 
@@ -53,7 +53,7 @@ class Forge
     /**
      * Primary keys.
      *
-     * @phpstan-var array{}|array{fields: string[], keyName: string}
+     * @var array{fields?: string[], keyName?: string}
      */
     protected $primaryKeys = [];
 
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 4ed9b5152eea..879437da6f6a 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -28,8 +28,7 @@ class Table
     /**
      * All of the fields this table represents.
      *
-     * @var array
-     * @phpstan-var array<string, array<string, bool|int|string|null>>
+     * @var array<string, array<string, bool|int|string|null>>
      */
     protected $fields = [];
 
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index f51fa417b4ed..749f6f34d5c7 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -25,8 +25,7 @@ class Seeder
     /**
      * The name of the database group to use.
      *
-     * @var string
-     * @phpstan-var non-empty-string
+     * @var non-empty-string
      */
     protected $DBGroup;
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index bbcfcc8e8889..a9887fba15ce 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -117,7 +117,6 @@ public function initialize()
      * and fire an event that allows custom actions to be taken at this point.
      *
      * @return void
-     * @phpstan-return never|void
      */
     public function exceptionHandler(Throwable $exception)
     {
@@ -215,7 +214,6 @@ public function errorHandler(int $severity, string $message, ?string $file = nul
      * @codeCoverageIgnore
      *
      * @return void
-     * @phpstan-return never|void
      */
     public function shutdownHandler()
     {
@@ -280,7 +278,6 @@ protected function determineView(Throwable $exception, string $templatePath): st
      * Given an exception and status code will display the error to the client.
      *
      * @return void
-     * @phpstan-return never|void
      *
      * @deprecated 4.4.0 No longer used. Moved to BaseExceptionHandler.
      */
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index f54335b6dd70..2163bb0b2587 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -38,7 +38,7 @@ class Iterator
      * Tests are simply closures that the user can define any sequence of
      * things to happen during the test.
      *
-     * @phpstan-param Closure(): mixed $closure
+     * @param Closure(): mixed $closure
      *
      * @return $this
      */
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index d43bf1c5a32a..103094b0a641 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -133,8 +133,8 @@ public function has(string $name): bool
      * Executes callable and measures its time.
      * Returns its return value if any.
      *
-     * @param string $name The name of the timer
-     * @phpstan-param callable(): mixed $callable callable to be executed
+     * @param string            $name     The name of the timer
+     * @param callable(): mixed $callable callable to be executed
      *
      * @return array|bool|float|int|object|resource|string|null
      */
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 73c777ba7289..4a7a20632fd7 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -435,7 +435,6 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
      * @codeCoverageIgnore
      *
      * @return void
-     * @phpstan-return never|void
      */
     public function respond()
     {
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 4b2ff96fe8b5..b527f2ed3c95 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -80,7 +80,6 @@ public function __construct()
      * @internal
      *
      * @return void
-     * @phpstan-return never|void
      */
     public static function collect(Query $query)
     {
diff --git a/system/Email/Email.php b/system/Email/Email.php
index a6ad2d993204..0adb3e6eb5e6 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -352,8 +352,7 @@ class Email
      * Character sets valid for 7-bit encoding,
      * excluding language suffix.
      *
-     * @var array<int, string>
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     protected $baseCharsets = [
         'us-ascii',
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 65898c012dc9..90d3ab46a297 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -55,8 +55,7 @@ class Entity implements JsonSerializable
     /**
      * The date fields.
      *
-     * @var array<int, string>
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     protected $dates = [
         'created_at',
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index df27e3f6cee3..18001b103844 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -87,16 +87,14 @@ class Filters
     /**
      * Any arguments to be passed to filters.
      *
-     * @var array<string, array<int, string>|null> [name => params]
-     * @phpstan-var array<string, list<string>|null>
+     * @var array<string, list<string>|null> [name => params]
      */
     protected $arguments = [];
 
     /**
      * Any arguments to be passed to filtersClass.
      *
-     * @var array<string, array|null> [classname => arguments]
-     * @phpstan-var array<class-string, array<string, list<string>>|null>
+     * @var array<class-string, array<string, list<string>>|null> [classname => arguments]
      */
     protected $argumentsClass = [];
 
@@ -373,8 +371,7 @@ public function enableFilter(string $name, string $when = 'before')
      *
      * @param string $name filter_name or filter_name:arguments like 'role:admin,manager'
      *
-     * @return array [name, arguments]
-     * @phpstan-return array{0: string, 1: list<string>}
+     * @return array{0: string, 1: list<string>} [name, arguments]
      */
     private function getCleanName(string $name): array
     {
diff --git a/system/Helpers/kint_helper.php b/system/Helpers/kint_helper.php
index eaa2e947bc96..4221573a2ce6 100644
--- a/system/Helpers/kint_helper.php
+++ b/system/Helpers/kint_helper.php
@@ -18,7 +18,7 @@
          *
          * @param array $vars
          *
-         * @phpstan-return never
+         * @return never
          *
          * @codeCoverageIgnore Can't be tested ... exits
          */
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index afd703147870..0964edc4f3bf 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -93,8 +93,7 @@ class Logger implements LoggerInterface
      * value is an associative array of configuration
      * items.
      *
-     * @var array
-     * @phpstan-var array<class-string, array<string, list<string>|string|int>>
+     * @var array<class-string, array<string, int|list<string>|string>>
      */
     protected $handlerConfig = [];
 
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 0a26fc12f865..a86e92f0161a 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -49,7 +49,7 @@ final class AutoRouterImproved implements AutoRouterInterface
     /**
      * An array of params to the controller method.
      *
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     private array $params = [];
 
@@ -77,7 +77,7 @@ final class AutoRouterImproved implements AutoRouterInterface
     /**
      * The URI segments.
      *
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     private array $segments = [];
 
@@ -286,7 +286,7 @@ public function getRoute(string $uri, string $httpVerb): array
         }
 
         // The first item may be a method name.
-        /** @phpstan-var list<string> $params */
+        /** @var list<string> $params */
         $params = $this->params;
 
         $methodParam = array_shift($params);
diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php
index f8e245d19723..4fdbbb02597b 100644
--- a/system/Router/DefinedRouteCollector.php
+++ b/system/Router/DefinedRouteCollector.php
@@ -29,7 +29,7 @@ public function __construct(RouteCollection $routes)
     }
 
     /**
-     * @phpstan-return Generator<array{method: string, route: string, name: string, handler: string}>
+     * @return Generator<array{method: string, route: string, name: string, handler: string}>
      */
     public function collect(): Generator
     {
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index b3bb96e9fa2b..9a51e6f89a98 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1267,8 +1267,7 @@ public function getFilterForRoute(string $search, ?string $verb = null): string
      *
      * @param string $search routeKey
      *
-     * @return array<int, string> filter_name or filter_name:arguments like 'role:admin,manager'
-     * @phpstan-return list<string>
+     * @return list<string> filter_name or filter_name:arguments like 'role:admin,manager'
      */
     public function getFiltersForRoute(string $search, ?string $verb = null): array
     {
@@ -1305,8 +1304,7 @@ protected function fillRouteParams(string $from, ?array $params = null): string
          * Build our resulting string, inserting the $params in
          * the appropriate places.
          *
-         * @var array<int, string> $patterns
-         * @phpstan-var list<string> $patterns
+         * @var list<string> $patterns
          */
         $patterns = $matches[0];
 
@@ -1357,8 +1355,7 @@ protected function buildReverseRoute(string $from, array $params): string
          * Build our resulting string, inserting the $params in
          * the appropriate places.
          *
-         * @var array<int, string> $placeholders
-         * @phpstan-var list<string> $placeholders
+         * @var list<string> $placeholders
          */
         $placeholders = $matches[0];
 
@@ -1691,8 +1688,7 @@ public function resetRoutes()
     /**
      * Load routes options based on verb
      *
-     * @return array<string, array<string, array|int|string>> [routeKey(or from) => [key => value]]
-     * @phpstan-return array<
+     * @return array<
      *     string,
      *     array{
      *         filter?: string|list<string>, namespace?: string, hostname?: string,
@@ -1740,8 +1736,7 @@ public function setPrioritize(bool $enabled = true)
      *
      * @param string|null $verb HTTP verb. `'*'` returns all controllers in any verb.
      *
-     * @return array<int, string> controller name list
-     * @phpstan-return list<string>
+     * @return list<string> controller name list
      */
     public function getRegisteredControllers(?string $verb = '*'): array
     {
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index a0c84c48f2b7..4e889b5ea1d0 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -135,8 +135,7 @@ abstract class CIUnitTestCase extends TestCase
      * The name of the database group to connect to.
      * If not present, will use the defaultGroup.
      *
-     * @var string
-     * @phpstan-var non-empty-string
+     * @var non-empty-string
      */
     protected $DBGroup = 'tests';
 
diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php
index e61e0663836b..6583c9f2839e 100644
--- a/tests/system/AutoReview/FrameworkCodeTest.php
+++ b/tests/system/AutoReview/FrameworkCodeTest.php
@@ -41,7 +41,7 @@ final class FrameworkCodeTest extends TestCase
     /**
      * @dataProvider provideEachTestClassHasCorrectGroupAnnotation
      *
-     * @phpstan-param class-string $class
+     * @param class-string $class
      */
     public function testEachTestClassHasCorrectGroupAnnotation(string $class): void
     {
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 4c81537dbf09..6624c6f3cf1b 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -35,7 +35,7 @@ final class AutoloaderTest extends CIUnitTestCase
     private Autoloader $loader;
 
     /**
-     * @phpstan-var Closure(string): (false|string)
+     * @var Closure(string): (false|string)
      */
     private Closure $classLoader;
 
diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php
index a1079e63a463..12eaeb1a2d23 100644
--- a/tests/system/Cache/ResponseCacheTest.php
+++ b/tests/system/Cache/ResponseCacheTest.php
@@ -68,7 +68,7 @@ private function createIncomingRequest(
     }
 
     /**
-     * @phpstan-param list<string> $params
+     * @param list<string> $params
      */
     private function createCLIRequest(array $params = [], ?AppConfig $appConfig = null): CLIRequest
     {

From 51391df5933d474595e12a9b96685d66aa19a039 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 Oct 2023 16:28:25 +0900
Subject: [PATCH 026/380] fix: cannot see "Controller" row in dark mode

---
 admin/css/debug-toolbar/_theme-dark.scss | 4 ----
 system/Debug/Toolbar/Views/toolbar.css   | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/admin/css/debug-toolbar/_theme-dark.scss b/admin/css/debug-toolbar/_theme-dark.scss
index 5f68f8c20b5f..ead7d02a58e3 100644
--- a/admin/css/debug-toolbar/_theme-dark.scss
+++ b/admin/css/debug-toolbar/_theme-dark.scss
@@ -150,10 +150,6 @@
         .timer {
             background-color: $g-orange;
         }
-
-        .timeline-parent-open td {
-            color: $t-dark;
-        }
     }
 }
 
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 89555b4f7d40..8a302b4019e9 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -532,9 +532,6 @@
   #debug-bar .timeline .timer {
     background-color: #DD8615;
   }
-  #debug-bar .timeline .timeline-parent-open td {
-    color: #252525;
-  }
   .debug-view.show-view {
     border-color: #DD8615;
   }
@@ -647,9 +644,6 @@
 #toolbarContainer.dark #debug-bar .timeline .timer {
   background-color: #DD8615;
 }
-#toolbarContainer.dark #debug-bar .timeline .timeline-parent-open td {
-  color: #252525;
-}
 #toolbarContainer.dark .debug-view.show-view {
   border-color: #DD8615;
 }

From e3440d756071373cc3f20c90677e7c727fad0745 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 Oct 2023 16:29:56 +0900
Subject: [PATCH 027/380] docs: update css.md

---
 contributing/css.md | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/contributing/css.md b/contributing/css.md
index 7accf5e83801..267d4f7a5609 100644
--- a/contributing/css.md
+++ b/contributing/css.md
@@ -9,7 +9,9 @@ the official website: <https://sass-lang.com/install>
 Open your terminal, and navigate to CodeIgniter's root folder. To
 generate the CSS file, use the following command:
 
-`sass --no-source-map admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css`
+```console
+sass --no-source-map admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css`
+```
 
 Details:
 - `--no-source-map` is an option which prevents sourcemap files from being generated
@@ -18,23 +20,4 @@ Details:
 
 ## Color scheme
 
-**Themes**
-
-Dark: `#252525` / `rgb(37, 37, 37)`
-Light: `#FFFFFF` / `rgb(255, 255, 255)`
-
-**Glossy colors**
-
-Blue: `#5BC0DE` / `rgb(91, 192, 222)`
-Gray: `#434343` / `rgb(67, 67, 67)`
-Green: `#9ACE25` / `rgb(154, 206, 37)`
-Orange: `#DD8615` / `rgb(221, 134, 21)`
-Red: `#DD4814` / `rgb(221, 72, 20)`
-
-**Matt colors**
-
-Blue: `#D8EAF0` / `rgb(216, 234, 240)`
-Gray: `#DFDFDF` / `rgb(223, 223, 223)`
-Green: `#DFF0D8` / `rgb(223, 240, 216)`
-Orange: `#FDC894` / `rgb(253, 200, 148)`
-Red: `#EF9090` / `rgb(239, 144, 144)`
+See [_graphic-charter.scss](../admin/css/debug-toolbar/_graphic-charter.scss).

From 50da2138d553bf01d7cad8e1ea9fcc6f31cf34b0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 Oct 2023 09:03:40 +0900
Subject: [PATCH 028/380] fix!: Validation rule with * gets incorrect values as
 dot array syntax

---
 system/Validation/Validation.php           | 45 ++++++++++++++++------
 tests/system/Validation/ValidationTest.php | 12 +++---
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index ad95cde7bc6b..f8c64e63ab3c 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -168,12 +168,21 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
             }
 
             if (strpos($field, '*') !== false) {
-                $values = array_filter(array_flatten_with_dots($data), static fn ($key) => preg_match(
-                    '/^'
-                    . str_replace(['\.\*', '\*\.'], ['\..+', '.+\.'], preg_quote($field, '/'))
-                    . '$/',
-                    $key
-                ), ARRAY_FILTER_USE_KEY);
+                $flattenedArray = array_flatten_with_dots($data);
+
+                $pattern = '/\A'
+                    . str_replace(
+                        ['\.\*', '\*\.'],
+                        ['\.[^.]+', '[^.]+\.'],
+                        preg_quote($field, '/')
+                    )
+                    . '\z/';
+                $values = array_filter(
+                    $flattenedArray,
+                    static fn ($key) => preg_match($pattern, $key),
+                    ARRAY_FILTER_USE_KEY
+                );
+
                 // if keys not found
                 $values = $values ?: [$field => null];
             } else {
@@ -814,7 +823,13 @@ private function retrievePlaceholders(string $rule, array $data): array
      */
     public function hasError(string $field): bool
     {
-        $pattern = '/^' . str_replace('\.\*', '\..+', preg_quote($field, '/')) . '$/';
+        $pattern = '/\A'
+            . str_replace(
+                ['\.\*', '\*\.'],
+                ['\.[^.]+', '[^.]+\.'],
+                preg_quote($field, '/')
+            )
+            . '\z/';
 
         return (bool) preg_grep($pattern, array_keys($this->getErrors()));
     }
@@ -829,10 +844,18 @@ public function getError(?string $field = null): string
             $field = array_key_first($this->rules);
         }
 
-        $errors = array_filter($this->getErrors(), static fn ($key) => preg_match(
-            '/^' . str_replace(['\.\*', '\*\.'], ['\..+', '.+\.'], preg_quote($field, '/')) . '$/',
-            $key
-        ), ARRAY_FILTER_USE_KEY);
+        $pattern = '/\A'
+            . str_replace(
+                ['\.\*', '\*\.'],
+                ['\.[^.]+', '[^.]+\.'],
+                preg_quote($field, '/')
+            )
+            . '\z/';
+        $errors = array_filter(
+            $this->getErrors(),
+            static fn ($key) => preg_match($pattern, $key),
+            ARRAY_FILTER_USE_KEY
+        );
 
         return $errors === [] ? '' : implode("\n", $errors);
     }
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index e015c8b21de9..1c42b263b499 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -1111,9 +1111,9 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
         $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
 
         $this->validation->setRules([
-            'id_user.*'       => 'numeric',
-            'name_user.*'     => 'alpha',
-            'contacts.*.name' => 'required',
+            'id_user.*'               => 'numeric',
+            'name_user.*'             => 'alpha',
+            'contacts.friends.*.name' => 'required',
         ]);
 
         $this->validation->withRequest($request->withMethod('post'))->run();
@@ -1121,7 +1121,7 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
             'id_user.0'               => 'The id_user.* field must contain only numbers.',
             'name_user.0'             => 'The name_user.* field may only contain alphabetical characters.',
             'name_user.2'             => 'The name_user.* field may only contain alphabetical characters.',
-            'contacts.friends.0.name' => 'The contacts.*.name field is required.',
+            'contacts.friends.0.name' => 'The contacts.friends.*.name field is required.',
         ], $this->validation->getErrors());
 
         $this->assertSame(
@@ -1130,8 +1130,8 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
             $this->validation->getError('name_user.*')
         );
         $this->assertSame(
-            'The contacts.*.name field is required.',
-            $this->validation->getError('contacts.*.name')
+            'The contacts.friends.*.name field is required.',
+            $this->validation->getError('contacts.friends.*.name')
         );
     }
 

From 340e28efb49f4a2e053e4dfe9a076be57a4d24c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 Oct 2023 09:12:27 +0900
Subject: [PATCH 029/380] docs: fix incorrect dot array syntax keys

---
 user_guide_src/source/libraries/validation.rst     | 6 +++---
 user_guide_src/source/libraries/validation/009.php | 7 +------
 user_guide_src/source/libraries/validation/010.php | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 0288090b6f6f..7300fa88ff56 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -591,7 +591,7 @@ If you need to retrieve all error messages for failed fields, you can use the ``
 
 If no errors exist, an empty array will be returned.
 
-When using a wildcard, the error will point to a specific field, replacing the asterisk with the appropriate key/keys::
+When using a wildcard (``*``), the error will point to a specific field, replacing the asterisk with the appropriate key/keys::
 
     // for data
     'contacts' => [
@@ -606,10 +606,10 @@ When using a wildcard, the error will point to a specific field, replacing the a
     ]
 
     // rule
-    'contacts.*.name' => 'required'
+    'contacts.friends.*.name' => 'required'
 
     // error will be
-    'contacts.friends.1.name' => 'The contacts.*.name field is required.'
+    'contacts.friends.1.name' => 'The contacts.friends.*.name field is required.'
 
 Getting a Single Error
 ======================
diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php
index 7e321e9664ff..85be52b7abb2 100644
--- a/user_guide_src/source/libraries/validation/009.php
+++ b/user_guide_src/source/libraries/validation/009.php
@@ -4,7 +4,7 @@
  * The data to test:
  * [
  *     'contacts' => [
- *        'name' => 'Joe Smith',
+ *         'name' => 'Joe Smith',
  *         'friends' => [
  *             [
  *                 'name' => 'Fred Flinstone',
@@ -21,8 +21,3 @@
 $validation->setRules([
     'contacts.name' => 'required|max_length[60]',
 ]);
-
-// Fred Flintsone & Wilma
-$validation->setRules([
-    'contacts.friends.name' => 'required|max_length[60]',
-]);
diff --git a/user_guide_src/source/libraries/validation/010.php b/user_guide_src/source/libraries/validation/010.php
index 0951f582c882..2646fcc32b99 100644
--- a/user_guide_src/source/libraries/validation/010.php
+++ b/user_guide_src/source/libraries/validation/010.php
@@ -2,5 +2,5 @@
 
 // Fred Flintsone & Wilma
 $validation->setRules([
-    'contacts.*.name' => 'required|max_length[60]',
+    'contacts.friends.*.name' => 'required|max_length[60]',
 ]);

From 1b48e13064f95b817aac9e6088227797fdb774e0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 Oct 2023 09:12:55 +0900
Subject: [PATCH 030/380] docs: fix text decoration

---
 user_guide_src/source/libraries/validation.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 7300fa88ff56..e1b0161ff714 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -830,7 +830,8 @@ alpha_numeric_punct     No         Fails if field contains anything other than
                                    alphanumeric, space, or this limited set of
                                    punctuation characters: ``~`` (tilde),
                                    ``!`` (exclamation), ``#`` (number),
-                                   ``$`` (dollar), ``% (percent), & (ampersand),
+                                   ``$`` (dollar), ``%`` (percent),
+                                   ``&`` (ampersand),
                                    ``*`` (asterisk), ``-`` (dash),
                                    ``_`` (underscore), ``+`` (plus),
                                    ``=`` (equals), ``|`` (vertical bar),

From 77a17aac29c76c66019b61e31a5906072909d089 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 Oct 2023 09:27:04 +0900
Subject: [PATCH 031/380] test: rename test method

We use the word asterisk here.
---
 tests/system/Validation/ValidationTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 1c42b263b499..7f11b86d916a 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -1228,17 +1228,17 @@ public function testTranslatedLabelTagReplacement(): void
     }
 
     /**
-     * @dataProvider provideDotNotationOnIfExistRule
+     * @dataProvider provideIfExistRuleWithAsterisk
      *
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/4521
      */
-    public function testDotNotationOnIfExistRule(bool $expected, array $rules, array $data): void
+    public function testIfExistRuleWithAsterisk(bool $expected, array $rules, array $data): void
     {
         $actual = $this->validation->setRules($rules)->run($data);
         $this->assertSame($expected, $actual);
     }
 
-    public static function provideDotNotationOnIfExistRule(): iterable
+    public static function provideIfExistRuleWithAsterisk(): iterable
     {
         yield 'dot-on-end-fail' => [
             false,
@@ -1613,7 +1613,7 @@ public function testRuleWithLeadingAsterisk(): void
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/5942
      */
-    public function testRequireWithoutWithWildCard(): void
+    public function testRequireWithoutWithAsterisk(): void
     {
         $data = [
             'a' => [

From 09e194dc591633dbac0aad96a3987ff671e4c3f4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 Oct 2023 09:43:51 +0900
Subject: [PATCH 032/380] test: add test for multidimensinal array and `*`

---
 tests/system/Validation/ValidationTest.php | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 7f11b86d916a..7cc6f99c40d5 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -1631,4 +1631,50 @@ public function testRequireWithoutWithAsterisk(): void
             $this->validation->getError('a.1.c')
         );
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/8128
+     */
+    public function testRuleWithAsteriskToMultiDimensionalArray(): void
+    {
+        $data = [
+            'contacts' => [
+                'name' => 'Joe Smith',
+                'just' => [
+                    'friends' => [
+                        [
+                            'name' => 'Fred Flinstone',
+                        ],
+                        [
+                            'name' => 'Wilma',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->validation->setRules(
+            ['contacts.just.friends.*.name' => 'required|max_length[1]']
+        );
+        $this->assertFalse($this->validation->run($data));
+        $this->assertSame(
+            [
+                'contacts.just.friends.0.name' => 'The contacts.just.friends.*.name field cannot exceed 1 characters in length.',
+                'contacts.just.friends.1.name' => 'The contacts.just.friends.*.name field cannot exceed 1 characters in length.',
+            ],
+            $this->validation->getErrors()
+        );
+
+        $this->validation->reset();
+        $this->validation->setRules(
+            ['contacts.*.name' => 'required|max_length[1]']
+        );
+        $this->assertFalse($this->validation->run($data));
+        $this->assertSame(
+            // The data for `contacts.*.name` does not exist. So it is interpreted
+            // as `null`, and this error message returns.
+            ['contacts.*.name' => 'The contacts.*.name field is required.'],
+            $this->validation->getErrors()
+        );
+    }
 }

From 410b7a9041bd33001122079f312e592a6b74683f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 Oct 2023 10:54:51 +0900
Subject: [PATCH 033/380] docs: add changelog and upgrade

---
 user_guide_src/source/changelogs/v4.4.4.rst   |  7 ++++
 .../source/installation/upgrade_444.rst       | 19 ++++++++++
 .../source/installation/upgrade_444/001.php   | 38 +++++++++++++++++++
 .../source/libraries/validation.rst           |  6 +++
 4 files changed, 70 insertions(+)
 create mode 100644 user_guide_src/source/installation/upgrade_444/001.php

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index 218c56e738d7..cfb0aeb4f121 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -14,6 +14,13 @@ Release Date: Unreleased
 BREAKING
 ********
 
+Validation with Dot Array Syntax
+================================
+
+A validation rule with the wildcard ``*`` now validates only data in correct
+dimensions as "dot array syntax".
+See :ref:`Upgrading <upgrade-444-validation-with-dot-array-syntax>` for details.
+
 ***************
 Message Changes
 ***************
diff --git a/user_guide_src/source/installation/upgrade_444.rst b/user_guide_src/source/installation/upgrade_444.rst
index 6dbfa8e7baac..c0b4def6e34d 100644
--- a/user_guide_src/source/installation/upgrade_444.rst
+++ b/user_guide_src/source/installation/upgrade_444.rst
@@ -20,6 +20,25 @@ Mandatory File Changes
 Breaking Changes
 ****************
 
+.. _upgrade-444-validation-with-dot-array-syntax:
+
+Validation with Dot Array Syntax
+================================
+
+If you are using :ref:`dot array syntax <validation-dot-array-syntax>` in validation
+rules, a bug where ``*`` would validate data in incorrect dimensions has been fixed.
+
+In previous versions, the rule key ``contacts.*.name`` captured data with any
+level like ``contacts.*.name``, ``contacts.*.*.name``, ``contacts.*.*.*.name``,
+etc., incorrectly.
+
+The following code explains details:
+
+.. literalinclude:: upgrade_444/001.php
+   :lines: 2-
+
+If you have code that depends on the bug, fix the the rule key.
+
 *********************
 Breaking Enhancements
 *********************
diff --git a/user_guide_src/source/installation/upgrade_444/001.php b/user_guide_src/source/installation/upgrade_444/001.php
new file mode 100644
index 000000000000..9bcc6412141f
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_444/001.php
@@ -0,0 +1,38 @@
+<?php
+
+use Config\Services;
+
+$validation = Services::validation();
+
+$data = [
+    'contacts' => [
+        'name' => 'Joe Smith',
+        'just' => [
+            'friends' => [
+                ['name' => 'SATO Taro'],
+                ['name' => 'Li Ming'],
+                ['name' => 'Heinz Müller'],
+            ],
+        ],
+    ],
+];
+
+$validation->setRules(
+    ['contacts.*.name' => 'required|max_length[8]']
+);
+
+$validation->run($data); // false
+
+d($validation->getErrors());
+/*
+ Before: Captured `contacts.*.*.*.name` incorrectly.
+ [
+   contacts.just.friends.0.name => "The contacts.*.name field cannot exceed 8 characters in length.",
+   contacts.just.friends.2.name => "The contacts.*.name field cannot exceed 8 characters in length.",
+ ]
+
+ After: Captures no data for `contacts.*.name`.
+ [
+   contacts.*.name => string (38) "The contacts.*.name field is required.",
+ ]
+*/
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index e1b0161ff714..8ebec266c0bf 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -314,6 +314,8 @@ To give a labeled error message you can set up as:
 .. note:: ``setRules()`` will overwrite any rules that were set previously. To add more than one
     rule to an existing set of rules, use ``setRule()`` multiple times.
 
+.. _validation-dot-array-syntax:
+
 Setting Rules for Array Data
 ============================
 
@@ -328,6 +330,10 @@ You can use the ``*`` wildcard symbol to match any one level of the array:
 .. literalinclude:: validation/010.php
    :lines: 2-
 
+.. note:: Prior to v4.4.4, due to a bug, the wildcard ``*`` validated data in incorrect
+    dimensions. See :ref:`Upgrading <upgrade-444-validation-with-dot-array-syntax>`
+    for details.
+
 "dot array syntax" can also be useful when you have single dimension array data.
 For example, data returned by multi select dropdown:
 

From 4913acc1d6bab342e45a95fe14afd1866e3b23c9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 Oct 2023 11:22:33 +0900
Subject: [PATCH 034/380] refactor: extract getRegex()

---
 system/Validation/Validation.php | 42 +++++++++++++-------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index f8c64e63ab3c..b1612481b97b 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -170,16 +170,9 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
             if (strpos($field, '*') !== false) {
                 $flattenedArray = array_flatten_with_dots($data);
 
-                $pattern = '/\A'
-                    . str_replace(
-                        ['\.\*', '\*\.'],
-                        ['\.[^.]+', '[^.]+\.'],
-                        preg_quote($field, '/')
-                    )
-                    . '\z/';
                 $values = array_filter(
                     $flattenedArray,
-                    static fn ($key) => preg_match($pattern, $key),
+                    static fn ($key) => preg_match(self::getRegex($field), $key),
                     ARRAY_FILTER_USE_KEY
                 );
 
@@ -220,6 +213,20 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
         return false;
     }
 
+    /**
+     * Returns regex pattern for key with dot array syntax.
+     */
+    private static function getRegex(string $field): string
+    {
+        return '/\A'
+            . str_replace(
+                ['\.\*', '\*\.'],
+                ['\.[^.]+', '[^.]+\.'],
+                preg_quote($field, '/')
+            )
+            . '\z/';
+    }
+
     /**
      * Runs the validation process, returning true or false determining whether
      * validation was successful or not.
@@ -823,15 +830,7 @@ private function retrievePlaceholders(string $rule, array $data): array
      */
     public function hasError(string $field): bool
     {
-        $pattern = '/\A'
-            . str_replace(
-                ['\.\*', '\*\.'],
-                ['\.[^.]+', '[^.]+\.'],
-                preg_quote($field, '/')
-            )
-            . '\z/';
-
-        return (bool) preg_grep($pattern, array_keys($this->getErrors()));
+        return (bool) preg_grep(self::getRegex($field), array_keys($this->getErrors()));
     }
 
     /**
@@ -844,16 +843,9 @@ public function getError(?string $field = null): string
             $field = array_key_first($this->rules);
         }
 
-        $pattern = '/\A'
-            . str_replace(
-                ['\.\*', '\*\.'],
-                ['\.[^.]+', '[^.]+\.'],
-                preg_quote($field, '/')
-            )
-            . '\z/';
         $errors = array_filter(
             $this->getErrors(),
-            static fn ($key) => preg_match($pattern, $key),
+            static fn ($key) => preg_match(self::getRegex($field), $key),
             ARRAY_FILTER_USE_KEY
         );
 

From f057c17aa2e6c220b944b2770e35b068ef75374c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Nov 2023 09:00:07 +0900
Subject: [PATCH 035/380] docs: add section "Simple and Controlled Cells"

---
 user_guide_src/source/outgoing/view_cells.rst | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst
index 09b62bcad16a..ffca2d4bab69 100644
--- a/user_guide_src/source/outgoing/view_cells.rst
+++ b/user_guide_src/source/outgoing/view_cells.rst
@@ -4,12 +4,20 @@ View Cells
 
 Many applications have small view fragments that can be repeated from page to page, or in different places on the pages. These are often help boxes, navigation controls, ads, login forms, etc. CodeIgniter lets you encapsulate the logic for these presentation blocks within View Cells. They are basically mini-views that can be included in other views. They can have logic built in to handle any cell-specific display logic. They can be used to make your views more readable and maintainable by separating the logic for each cell into its own class.
 
-CodeIgniter supports two types of View Cells: simple and controlled. Simple View Cells can be generated from any class and method of your choice and does not have to follow any rules, except that it must return a string. Controlled View Cells must be generated from a class that extends ``Codeigniter\View\Cells\Cell`` class which provides additional capability making your View Cells more flexible and faster to use.
-
 .. contents::
     :local:
     :depth: 2
 
+***************************
+Simple and Controlled Cells
+***************************
+
+CodeIgniter supports two types of View Cells: simple and controlled.
+
+**Simple View Cells** can be generated from any class and method of your choice and does not have to follow any rules, except that it must return a string.
+
+**Controlled View Cells** must be generated from a class that extends ``Codeigniter\View\Cells\Cell`` class which provides additional capability making your View Cells more flexible and faster to use.
+
 .. _app-cells:
 
 *******************

From 44806d844c1ddddb9cdd44921db0fe3a94f99465 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Nov 2023 09:01:25 +0900
Subject: [PATCH 036/380] docs: improve explanation for "Calling a View Cell"

---
 user_guide_src/source/outgoing/view_cells.rst     | 6 ++++--
 user_guide_src/source/outgoing/view_cells/001.php | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst
index ffca2d4bab69..acd2d3b0f86c 100644
--- a/user_guide_src/source/outgoing/view_cells.rst
+++ b/user_guide_src/source/outgoing/view_cells.rst
@@ -26,11 +26,13 @@ Calling a View Cell
 
 No matter which type of View Cell you are using, you can call it from any view by using the ``view_cell()`` helper function.
 
-The first parameter is the name of the class and method to call, and the second parameter is an array of parameters to pass to the method:
+The first parameter is (1) *the name of the class and method* (Simple Cell) or (2) *the name of the class* (Controlled Cell) to call,
+and the second parameter is an array of parameters to pass to the method:
 
 .. literalinclude:: view_cells/001.php
 
-The Cell method must return a string, which will be inserted into the view where the ``view_cell()`` function was called.
+The string that the Cell returns will be inserted into the view where the
+``view_cell()`` function was called.
 
 Namespace Omission
 ==================
diff --git a/user_guide_src/source/outgoing/view_cells/001.php b/user_guide_src/source/outgoing/view_cells/001.php
index 2a9e4361796e..57a4fdc425dc 100644
--- a/user_guide_src/source/outgoing/view_cells/001.php
+++ b/user_guide_src/source/outgoing/view_cells/001.php
@@ -1,2 +1,7 @@
 // In a View.
+
+// Simple Cell
 <?= view_cell('App\Cells\MyClass::myMethod', ['param1' => 'value1', 'param2' => 'value2']) ?>
+
+// Controlled Cell
+<?= view_cell('App\Cells\MyCell', ['param1' => 'value1', 'param2' => 'value2']) ?>

From c99c118cfe666e9b1e3a9ab7942d9a0501d8319c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Nov 2023 09:02:40 +0900
Subject: [PATCH 037/380] docs: add empty lines for readability

---
 user_guide_src/source/outgoing/view_cells.rst | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst
index acd2d3b0f86c..da60d6644d8a 100644
--- a/user_guide_src/source/outgoing/view_cells.rst
+++ b/user_guide_src/source/outgoing/view_cells.rst
@@ -77,8 +77,10 @@ Controlled Cells
 
 .. versionadded:: 4.3.0
 
-Controlled cells have two primary goals: to make it as fast as possible to build the cell, and provide additional logic and
-flexibility to your views, if they need it. The class must extend ``CodeIgniter\View\Cells\Cell``. They should have a view file
+Controlled cells have two primary goals: (1) to make it as fast as possible to build the cell, and (2) provide additional logic and
+flexibility to your views, if they need it.
+
+The class must extend ``CodeIgniter\View\Cells\Cell``. They should have a view file
 in the same folder. By convention, the class name should be in PascalCase suffixed with ``Cell`` and the view should be
 the snake_cased version of the class name, without the suffix. For example, if you have a ``MyCell`` class, the view file
 should be ``my.php``.
@@ -89,7 +91,9 @@ should be ``my.php``.
 Creating a Controlled Cell
 ==========================
 
-At the most basic level, all you need to implement within the class are public properties. These properties will be made available to the view file automatically. Implementing the AlertMessage from above as a Controlled Cell would look like this:
+At the most basic level, all you need to implement within the class are public properties. These properties will be made available to the view file automatically.
+
+Implementing the AlertMessage from above as a Controlled Cell would look like this:
 
 .. literalinclude:: view_cells/008.php
 
@@ -118,7 +122,9 @@ You can specify a custom view name by setting the ``view`` property in the class
 Customize the Rendering
 =======================
 
-If you need more control over the rendering of the HTML, you can implement a ``render()`` method. This method allows you to perform additional logic and pass extra data the view, if needed. The ``render()`` method must return a string. To take advantage of the full features of controlled Cells, you should use ``$this->view()`` instead of the normal ``view()`` helper function:
+If you need more control over the rendering of the HTML, you can implement a ``render()`` method. This method allows you to perform additional logic and pass extra data the view, if needed. The ``render()`` method must return a string.
+
+To take advantage of the full features of controlled Cells, you should use ``$this->view()`` instead of the normal ``view()`` helper function:
 
 .. literalinclude:: view_cells/012.php
 

From 7a04c51aa25f492369880ab5adca7147cf09a48b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Nov 2023 09:03:08 +0900
Subject: [PATCH 038/380] docs: add return types in sample code

---
 user_guide_src/source/outgoing/view_cells/014.php | 2 +-
 user_guide_src/source/outgoing/view_cells/016.php | 2 +-
 user_guide_src/source/outgoing/view_cells/018.php | 2 +-
 user_guide_src/source/outgoing/view_cells/019.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_cells/014.php b/user_guide_src/source/outgoing/view_cells/014.php
index 29378e1199ab..7aa1ad4c9d8c 100644
--- a/user_guide_src/source/outgoing/view_cells/014.php
+++ b/user_guide_src/source/outgoing/view_cells/014.php
@@ -12,7 +12,7 @@ class AlertMessageCell extends Cell
     protected $message;
     private $computed;
 
-    public function mount()
+    public function mount(): void
     {
         $this->computed = sprintf('%s - %s', $this->type, $this->message);
     }
diff --git a/user_guide_src/source/outgoing/view_cells/016.php b/user_guide_src/source/outgoing/view_cells/016.php
index 4b2c10ef0cc6..54d9d7d994a4 100644
--- a/user_guide_src/source/outgoing/view_cells/016.php
+++ b/user_guide_src/source/outgoing/view_cells/016.php
@@ -10,7 +10,7 @@ class RecentPostsCell extends Cell
 {
     protected $posts;
 
-    public function linkPost($post)
+    public function linkPost($post): string
     {
         return anchor('posts/' . $post->id, $post->title);
     }
diff --git a/user_guide_src/source/outgoing/view_cells/018.php b/user_guide_src/source/outgoing/view_cells/018.php
index 3f64e68464e9..8767af1b40a2 100644
--- a/user_guide_src/source/outgoing/view_cells/018.php
+++ b/user_guide_src/source/outgoing/view_cells/018.php
@@ -8,7 +8,7 @@ class RecentPostsCell extends Cell
 {
     protected $posts;
 
-    public function mount()
+    public function mount(): void
     {
         $this->posts = model('PostModel')->orderBy('created_at', 'DESC')->findAll(10);
     }
diff --git a/user_guide_src/source/outgoing/view_cells/019.php b/user_guide_src/source/outgoing/view_cells/019.php
index df78ab0acec5..db1b12b56b54 100644
--- a/user_guide_src/source/outgoing/view_cells/019.php
+++ b/user_guide_src/source/outgoing/view_cells/019.php
@@ -10,7 +10,7 @@ class RecentPostsCell extends Cell
 {
     protected $posts;
 
-    public function mount(?int $categoryId)
+    public function mount(?int $categoryId): void
     {
         $this->posts = model('PostModel')
             ->when(

From 7de126005ec4e678764ea4f368605fdae9bd7617 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Nov 2023 09:18:48 +0900
Subject: [PATCH 039/380] fix: make:cell help message

---
 system/Commands/Generators/CellGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Generators/CellGenerator.php b/system/Commands/Generators/CellGenerator.php
index cf4757d10eeb..358bacc0c434 100644
--- a/system/Commands/Generators/CellGenerator.php
+++ b/system/Commands/Generators/CellGenerator.php
@@ -40,7 +40,7 @@ class CellGenerator extends BaseCommand
      *
      * @var string
      */
-    protected $description = 'Generates a new Cell file and its view.';
+    protected $description = 'Generates a new Controlled Cell file and its view.';
 
     /**
      * The Command's Usage
@@ -55,7 +55,7 @@ class CellGenerator extends BaseCommand
      * @var array<string, string>
      */
     protected $arguments = [
-        'name' => 'The cell class name.',
+        'name' => 'The Controlled Cell class name.',
     ];
 
     /**

From b0534cc2e587c5fefae57dd19a4a31e190fdccf0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Nov 2023 17:25:59 +0900
Subject: [PATCH 040/380] docs: fix incorrect description

Co-authored-by: Michal Sniatala <michal@sniatala.pl>
---
 user_guide_src/source/outgoing/view_cells.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst
index da60d6644d8a..f940bc99ea17 100644
--- a/user_guide_src/source/outgoing/view_cells.rst
+++ b/user_guide_src/source/outgoing/view_cells.rst
@@ -26,8 +26,8 @@ Calling a View Cell
 
 No matter which type of View Cell you are using, you can call it from any view by using the ``view_cell()`` helper function.
 
-The first parameter is (1) *the name of the class and method* (Simple Cell) or (2) *the name of the class* (Controlled Cell) to call,
-and the second parameter is an array of parameters to pass to the method:
+The first parameter is (1) *the name of the class and method* (Simple Cell) or (2) *the name of the class and optional method* (Controlled Cell) to call,
+and the second parameter is an array or string of parameters to pass to the method:
 
 .. literalinclude:: view_cells/001.php
 

From 66dbcf1f861b6a793fcf0c15a0457631daac8be4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Nov 2023 10:10:52 +0900
Subject: [PATCH 041/380] docs: fix incorrect sample code

It is not valid that "application/json" and "GET".
---
 user_guide_src/source/general/ajax.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/ajax.rst b/user_guide_src/source/general/ajax.rst
index ac113456053b..967e2c280c59 100644
--- a/user_guide_src/source/general/ajax.rst
+++ b/user_guide_src/source/general/ajax.rst
@@ -18,7 +18,7 @@ Fetch API
 .. code-block:: javascript
 
     fetch(url, {
-        method: "get",
+        method: "POST",
         headers: {
           "Content-Type": "application/json",
           "X-Requested-With": "XMLHttpRequest"

From 45e202701223306c4dc967b0f4b261afab281cec Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 Oct 2023 16:57:55 +0900
Subject: [PATCH 042/380] test: add tests for current behavior to matches and
 differs

---
 tests/system/Validation/RulesTest.php         | 35 ++++++++++---
 .../Validation/StrictRules/RulesTest.php      | 51 +++++++++++++++++++
 2 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 23358d08904b..346b323563e5 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -290,7 +290,7 @@ public static function providePermitEmpty(): iterable
     }
 
     /**
-     * @dataProvider provideMatchesCases
+     * @dataProvider provideMatches
      */
     public function testMatches(array $data, bool $expected): void
     {
@@ -298,12 +298,18 @@ public function testMatches(array $data, bool $expected): void
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public static function provideMatchesCases(): iterable
+    public static function provideMatches(): iterable
     {
         yield from [
-            [['foo' => null, 'bar' => null], true],
-            [['foo' => 'match', 'bar' => 'match'], true],
-            [['foo' => 'match', 'bar' => 'nope'], false],
+            'foo bar not exist'        => [[], false],
+            'bar not exist'            => [['foo' => null], false],
+            'foo not exist'            => [['bar' => null], true], // should be 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 not match'  => [['foo' => 1.2, 'bar' => 2.3], false],
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], false], // should be true
         ];
     }
 
@@ -325,12 +331,27 @@ public static function provideMatchesNestedCases(): iterable
     }
 
     /**
-     * @dataProvider provideMatchesCases
+     * @dataProvider provideDiffers
      */
     public function testDiffers(array $data, bool $expected): void
     {
         $this->validation->setRules(['foo' => 'differs[bar]']);
-        $this->assertSame(! $expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public static function provideDiffers(): iterable
+    {
+        yield from [
+            'foo bar not exist'        => [[], false],
+            'bar not exist'            => [['foo' => null], false],
+            'foo not exist'            => [['bar' => null], false],
+            '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 not match'  => [['foo' => 1.2, 'bar' => 2.3], true],
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], true], // should be false
+        ];
     }
 
     /**
diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
index 495fa02e20e9..62b7241331a4 100644
--- a/tests/system/Validation/StrictRules/RulesTest.php
+++ b/tests/system/Validation/StrictRules/RulesTest.php
@@ -198,4 +198,55 @@ public static function provideLessEqualThanStrict(): iterable
             [true, '0', false],
         ];
     }
+
+    /**
+     * @dataProvider provideMatches
+     */
+    public function testMatches(array $data, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'matches[bar]']);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    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 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],
+        ];
+    }
+
+    /**
+     * @dataProvider provideDiffers
+     */
+    public function testDiffers(array $data, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'differs[bar]']);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public static function provideDiffers(): iterable
+    {
+        yield from [
+            'foo bar not exist'        => [[], false],
+            'bar not exist'            => [['foo' => null], false],
+            'foo not exist'            => [['bar' => null], false],
+            '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], false],
+            'foo bar float not match'  => [['foo' => 1.2, 'bar' => 2.3], false],
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], false],
+        ];
+    }
 }

From c06e0b3a3c7889374120ab80f698243f853c8424 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 Oct 2023 21:00:36 +0900
Subject: [PATCH 043/380] fix: strict validation rule matches and differs

---
 system/Validation/StrictRules/Rules.php       | 44 ++++++++++++++++---
 tests/system/Validation/RulesTest.php         | 10 ++---
 .../Validation/StrictRules/RulesTest.php      | 13 +++---
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index 0887eff28ada..70d081975a62 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/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);
     }
 
     /**
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 346b323563e5..601be2d0e7ca 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/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
         ];
     }
 
diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
index 62b7241331a4..74ed4d6cecd6 100644
--- a/tests/system/Validation/StrictRules/RulesTest.php
+++ b/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],
         ];
     }

From c83e2ea981d5a8814749e64f7c2ebe03894c565c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 Oct 2023 06:39:42 +0900
Subject: [PATCH 044/380] fix: traditional validation rule matches and differs

Match CI3 behaviros.
---
 system/Validation/Rules.php           | 12 +++++++-----
 tests/system/Validation/RulesTest.php | 12 ++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index b7c585f56c30..6a809dc534cc 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -24,9 +24,10 @@ class Rules
     /**
      * The value does not match another field in $data.
      *
-     * @param array $data Other field/value pairs
+     * @param string|null $str
+     * @param array       $data Other field/value pairs
      */
-    public function differs(?string $str, string $field, array $data): bool
+    public function differs($str, string $field, array $data): bool
     {
         if (strpos($field, '.') !== false) {
             return $str !== dot_array_search($field, $data);
@@ -177,15 +178,16 @@ public function less_than_equal_to(?string $str, string $max): bool
     /**
      * Matches the value of another field in $data.
      *
-     * @param array $data Other field/value pairs
+     * @param string|null $str
+     * @param array       $data Other field/value pairs
      */
-    public function matches(?string $str, string $field, array $data): bool
+    public function matches($str, string $field, array $data): bool
     {
         if (strpos($field, '.') !== false) {
             return $str === dot_array_search($field, $data);
         }
 
-        return array_key_exists($field, $data) && $str === $data[$field];
+        return isset($data[$field]) ? ($str === $data[$field]) : false;
     }
 
     /**
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 601be2d0e7ca..ac2f34bf825a 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/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], // Strict Rule: false
-            'foo bar null'             => [['foo' => null, 'bar' => null], true],
+            'foo not exist'            => [['bar' => null], false],
+            'foo bar null'             => [['foo' => null, 'bar' => null], false], // Strict Rule: 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], // Strict Rule: 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], false], // Strict Rule: true
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], 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], // Strict Rule: false
+            'foo bar float match'      => [['foo' => 1.2, 'bar' => 1.2], false],
             'foo bar float not match'  => [['foo' => 1.2, 'bar' => 2.3], true],
-            'foo bar bool match'       => [['foo' => true, 'bar' => true], true], // Strict Rule: false
+            'foo bar bool match'       => [['foo' => true, 'bar' => true], false],
         ];
     }
 

From fdd9ec88d8e267db6d3245e3c5255642268b0252 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 Oct 2023 06:53:20 +0900
Subject: [PATCH 045/380] refactor: by rector

---
 system/Validation/Rules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 6a809dc534cc..eae6d961ce7d 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -187,7 +187,7 @@ public function matches($str, string $field, array $data): bool
             return $str === dot_array_search($field, $data);
         }
 
-        return isset($data[$field]) ? ($str === $data[$field]) : false;
+        return isset($data[$field]) && $str === $data[$field];
     }
 
     /**

From db0ad7e22f28587f9ec062a4859bb4af42e26bd4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Nov 2023 16:57:20 +0900
Subject: [PATCH 046/380] docs: add changelog and upgrade

---
 user_guide_src/source/changelogs/v4.4.4.rst        |  6 ++++++
 user_guide_src/source/installation/upgrade_444.rst | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index cfb0aeb4f121..bb4250f1e63f 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -21,6 +21,12 @@ A validation rule with the wildcard ``*`` now validates only data in correct
 dimensions as "dot array syntax".
 See :ref:`Upgrading <upgrade-444-validation-with-dot-array-syntax>` for details.
 
+Validation rules matches and differs
+====================================
+
+Bugs have been fixed in the case where ``matches`` and ``differs`` in the Strict
+and Traditional rules validate data of non-string types.
+
 ***************
 Message Changes
 ***************
diff --git a/user_guide_src/source/installation/upgrade_444.rst b/user_guide_src/source/installation/upgrade_444.rst
index c0b4def6e34d..b3773947efd9 100644
--- a/user_guide_src/source/installation/upgrade_444.rst
+++ b/user_guide_src/source/installation/upgrade_444.rst
@@ -39,6 +39,17 @@ The following code explains details:
 
 If you have code that depends on the bug, fix the the rule key.
 
+Validation rules matches and differs
+====================================
+
+Because bugs have been fixed in the case where ``matches`` and ``differs`` in
+the Strict and Traditional rules validate data of non-string types, if you are
+using these rules and validate non-string data, the validation results might be
+changed (fixed).
+
+Note that Traditional Rules should not be used to validate data that is not a
+string.
+
 *********************
 Breaking Enhancements
 *********************

From 552ea6885ecff386e7b3f7bdb1419018442e20f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Nov 2023 16:29:02 +0900
Subject: [PATCH 047/380] docs: remove unneeded @depreacted in
 ResponseInterface::getStatusCode()

See https://github.com/php-fig/http-message/blob/master/src/ResponseInterface.php#L30
---
 system/HTTP/ResponseInterface.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php
index 878d1488c25d..a6d41c77be3c 100644
--- a/system/HTTP/ResponseInterface.php
+++ b/system/HTTP/ResponseInterface.php
@@ -110,8 +110,6 @@ interface ResponseInterface extends MessageInterface
      * to understand and satisfy the request.
      *
      * @return int Status code.
-     *
-     * @deprecated To be replaced by the PSR-7 version (compatible)
      */
     public function getStatusCode(): int;
 

From f9663572471b2c73414bbe92ac919ac0d624b098 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 13:32:21 +0900
Subject: [PATCH 048/380] fix: improve error message

---
 system/HTTP/SiteURI.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php
index d01f614a1c85..6d56507314e7 100644
--- a/system/HTTP/SiteURI.php
+++ b/system/HTTP/SiteURI.php
@@ -197,7 +197,7 @@ private function normalizeBaseURL(App $configApp): string
         // Validate baseURL
         if (filter_var($baseURL, FILTER_VALIDATE_URL) === false) {
             throw new ConfigException(
-                'Config\App::$baseURL is invalid.'
+                'Config\App::$baseURL "' . $baseURL . '" is not a valid URL.'
             );
         }
 

From bb68857fdbf46e4b2cf1e977a93468fc803b12c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 14:02:32 +0900
Subject: [PATCH 049/380] fix: PHPDoc types in controller.tpl.php

---
 .../Generators/Views/controller.tpl.php       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/system/Commands/Generators/Views/controller.tpl.php b/system/Commands/Generators/Views/controller.tpl.php
index de4447c56268..2fe99e1b296b 100644
--- a/system/Commands/Generators/Views/controller.tpl.php
+++ b/system/Commands/Generators/Views/controller.tpl.php
@@ -3,6 +3,7 @@
 namespace {namespace};
 
 use {useStatement};
+use CodeIgniter\HTTP\ResponseInterface;
 
 class {class} extends {extends}
 {
@@ -10,7 +11,7 @@ class {class} extends {extends}
     /**
      * Return an array of resource objects, themselves in array format
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function index()
     {
@@ -20,7 +21,7 @@ public function index()
     /**
      * Return the properties of a resource object
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function show($id = null)
     {
@@ -30,7 +31,7 @@ public function show($id = null)
     /**
      * Return a new resource object, with default properties
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function new()
     {
@@ -40,7 +41,7 @@ public function new()
     /**
      * Create a new resource object, from "posted" parameters
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function create()
     {
@@ -50,7 +51,7 @@ public function create()
     /**
      * Return the editable properties of a resource object
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function edit($id = null)
     {
@@ -60,7 +61,7 @@ public function edit($id = null)
     /**
      * Add or update a model resource, from "posted" properties
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function update($id = null)
     {
@@ -70,7 +71,7 @@ public function update($id = null)
     /**
      * Delete the designated resource object from the model
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function delete($id = null)
     {
@@ -80,7 +81,7 @@ public function delete($id = null)
     /**
      * Present a view of resource objects
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function index()
     {
@@ -90,9 +91,9 @@ public function index()
     /**
      * Present a view to present a specific resource object
      *
-     * @param mixed $id
+     * @param string $id
      *
-     * @return mixed
+     * @return ResponseInterface
      */
     public function show($id = null)
     {

From a884251c42bc72c02bb211547f641160f2283445 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 14:20:11 +0900
Subject: [PATCH 050/380] fix: @return in filter.tpl.php

---
 system/Commands/Generators/Views/filter.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Generators/Views/filter.tpl.php b/system/Commands/Generators/Views/filter.tpl.php
index c080e920a021..767ac0bd9208 100644
--- a/system/Commands/Generators/Views/filter.tpl.php
+++ b/system/Commands/Generators/Views/filter.tpl.php
@@ -21,7 +21,7 @@ class {class} implements FilterInterface
      * @param RequestInterface $request
      * @param array|null       $arguments
      *
-     * @return mixed
+     * @return RequestInterface|ResponseInterface|string|void
      */
     public function before(RequestInterface $request, $arguments = null)
     {
@@ -38,7 +38,7 @@ public function before(RequestInterface $request, $arguments = null)
      * @param ResponseInterface $response
      * @param array|null        $arguments
      *
-     * @return mixed
+     * @return ResponseInterface|void
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {

From 9d2b0713894822803693f30f54cdc6fb589ee5ff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 14:23:53 +0900
Subject: [PATCH 051/380] docs: fix @param in ControllerTestTrait

---
 system/Test/ControllerTestTrait.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
index 2da65d1aa2f7..a99b899eaf63 100644
--- a/system/Test/ControllerTestTrait.php
+++ b/system/Test/ControllerTestTrait.php
@@ -215,7 +215,7 @@ public function execute(string $method, ...$params)
     /**
      * Set controller's config, with method chaining.
      *
-     * @param mixed $appConfig
+     * @param App $appConfig
      *
      * @return $this
      */
@@ -229,7 +229,7 @@ public function withConfig($appConfig)
     /**
      * Set controller's request, with method chaining.
      *
-     * @param mixed $request
+     * @param IncomingRequest $request
      *
      * @return $this
      */
@@ -260,7 +260,7 @@ public function withResponse($response)
     /**
      * Set controller's logger, with method chaining.
      *
-     * @param mixed $logger
+     * @param LoggerInterface $logger
      *
      * @return $this
      */

From a851a0b66b1133cb8fa8fbe813ac41d797438b2a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 14:26:52 +0900
Subject: [PATCH 052/380] docs: fix @return in View/Plugins.php

---
 system/View/Plugins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index b74ad96bd385..4b20caef8d3f 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -32,7 +32,7 @@ public static function currentURL()
     /**
      * Wrap helper function to use as view plugin.
      *
-     * @return mixed|string|URI
+     * @return string|URI
      */
     public static function previousURL()
     {

From d58ce836695e122c418171efcaf5a7a7a6e3fad3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 15:45:13 +0900
Subject: [PATCH 053/380] docs: add csp.rst and move existing contents

---
 user_guide_src/source/outgoing/csp.rst        | 127 ++++++++++++++++++
 .../source/outgoing/{response => csp}/011.php |   0
 .../source/outgoing/{response => csp}/012.php |   0
 .../source/outgoing/{response => csp}/013.php |   0
 user_guide_src/source/outgoing/index.rst      |   1 +
 user_guide_src/source/outgoing/response.rst   | 116 ----------------
 6 files changed, 128 insertions(+), 116 deletions(-)
 create mode 100644 user_guide_src/source/outgoing/csp.rst
 rename user_guide_src/source/outgoing/{response => csp}/011.php (100%)
 rename user_guide_src/source/outgoing/{response => csp}/012.php (100%)
 rename user_guide_src/source/outgoing/{response => csp}/013.php (100%)

diff --git a/user_guide_src/source/outgoing/csp.rst b/user_guide_src/source/outgoing/csp.rst
new file mode 100644
index 000000000000..b0ca5263c1ef
--- /dev/null
+++ b/user_guide_src/source/outgoing/csp.rst
@@ -0,0 +1,127 @@
+.. _content-security-policy:
+
+#######################
+Content Security Policy
+#######################
+
+.. contents::
+    :local:
+    :depth: 2
+
+********************************
+What is Content Security Policy?
+********************************
+
+One of the best protections you have against XSS attacks is to implement a Content Security Policy on the site.
+This forces you to whitelist every single source of content that is pulled in from your site's HTML,
+including images, stylesheets, javascript files, etc. The browser will refuse content from sources that don't meet
+the whitelist. This whitelist is created within the response's ``Content-Security-Policy`` header and has many
+different ways it can be configured.
+
+This sounds complex, and on some sites, can definitely be challenging. For many simple sites, though, where all content
+is served by the same domain (http://example.com), it is very simple to integrate.
+
+As this is a complex subject, this user guide will not go over all of the details. For more information, you should
+visit the following sites:
+
+* `Content Security Policy main site <https://content-security-policy.com/>`_
+* `W3C Specification <https://www.w3.org/TR/CSP>`_
+* `Introduction at HTML5Rocks <https://www.html5rocks.com/en/tutorials/security/content-security-policy/>`_
+* `Article at SitePoint <https://www.sitepoint.com/improving-web-security-with-the-content-security-policy/>`_
+
+**************
+Turning CSP On
+**************
+
+.. important:: The :ref:`Debug Toolbar <the-debug-toolbar>` may use Kint, which
+    outputs inline scripts. Therefore, when CSP is turned on, CSP nonce is
+    automatically output for the Debug Toolbar. However, if you are not using
+    CSP nonce, this will change the CSP header to something you do not intend,
+    and it will behave differently than in production; if you want to verify CSP
+    behavior, turn off the Debug Toolbar.
+
+By default, support for this is off. To enable support in your application, edit the ``CSPEnabled`` value in
+**app/Config/App.php**:
+
+.. literalinclude:: csp/011.php
+
+When enabled, the response object will contain an instance of ``CodeIgniter\HTTP\ContentSecurityPolicy``. The
+values set in **app/Config/ContentSecurityPolicy.php** are applied to that instance, and if no changes are
+needed during runtime, then the correctly formatted header is sent and you're all done.
+
+With CSP enabled, two header lines are added to the HTTP response: a **Content-Security-Policy** header, with
+policies identifying content types or origins that are explicitly allowed for different
+contexts, and a **Content-Security-Policy-Report-Only** header, which identifies content types
+or origins that will be allowed but which will also be reported to the destination
+of your choice.
+
+Our implementation provides for a default treatment, changeable through the ``reportOnly()`` method.
+When an additional entry is added to a CSP directive, as shown below, it will be added
+to the CSP header appropriate for blocking or preventing. That can be overridden on a per
+call basis, by providing an optional second parameter to the adding method call.
+
+*********************
+Runtime Configuration
+*********************
+
+If your application needs to make changes at run-time, you can access the instance at ``$this->response->getCSP()`` in your controllers. The
+class holds a number of methods that map pretty clearly to the appropriate header value that you need to set.
+Examples are shown below, with different combinations of parameters, though all accept either a directive
+name or an array of them:
+
+.. literalinclude:: csp/012.php
+
+The first parameter to each of the "add" methods is an appropriate string value,
+or an array of them.
+
+The ``reportOnly()`` method allows you to specify the default reporting treatment
+for subsequent sources, unless over-ridden. For instance, you could specify
+that youtube.com was allowed, and then provide several allowed but reported sources:
+
+.. literalinclude:: csp/013.php
+
+**************
+Inline Content
+**************
+
+It is possible to set a website to not protect even inline scripts and styles on its own pages, since this might have
+been the result of user-generated content. To protect against this, CSP allows you to specify a nonce within the
+``<style>`` and ``<script>`` tags, and to add those values to the response's header. This is a pain to handle in real
+life, and is most secure when generated on the fly. To make this simple, you can include a ``{csp-style-nonce}`` or
+``{csp-script-nonce}`` placeholder in the tag and it will be handled for you automatically::
+
+    // Original
+    <script {csp-script-nonce}>
+        console.log("Script won't run as it doesn't contain a nonce attribute");
+    </script>
+
+    // Becomes
+    <script nonce="Eskdikejidojdk978Ad8jf">
+        console.log("Script won't run as it doesn't contain a nonce attribute");
+    </script>
+
+    // OR
+    <style {csp-style-nonce}>
+        . . .
+    </style>
+
+.. warning:: If an attacker injects a string like ``<script {csp-script-nonce}>``, it might become the real nonce attribute with this functionality. You can customize the placeholder string with the ``$scriptNonceTag`` and ``$styleNonceTag`` properties in **app/Config/ContentSecurityPolicy.php**.
+
+If you don't like this auto replacement functionality, you can turn it off with setting ``$autoNonce = false`` in **app/Config/ContentSecurityPolicy.php**.
+
+In this case, you can use the functions, :php:func:`csp_script_nonce()` and :php:func:`csp_style_nonce()`::
+
+    // Original
+    <script <?= csp_script_nonce() ?>>
+        console.log("Script won't run as it doesn't contain a nonce attribute");
+    </script>
+
+    // Becomes
+    <script nonce="Eskdikejidojdk978Ad8jf">
+        console.log("Script won't run as it doesn't contain a nonce attribute");
+    </script>
+
+    // OR
+    <style <?= csp_style_nonce() ?>>
+        . . .
+    </style>
diff --git a/user_guide_src/source/outgoing/response/011.php b/user_guide_src/source/outgoing/csp/011.php
similarity index 100%
rename from user_guide_src/source/outgoing/response/011.php
rename to user_guide_src/source/outgoing/csp/011.php
diff --git a/user_guide_src/source/outgoing/response/012.php b/user_guide_src/source/outgoing/csp/012.php
similarity index 100%
rename from user_guide_src/source/outgoing/response/012.php
rename to user_guide_src/source/outgoing/csp/012.php
diff --git a/user_guide_src/source/outgoing/response/013.php b/user_guide_src/source/outgoing/csp/013.php
similarity index 100%
rename from user_guide_src/source/outgoing/response/013.php
rename to user_guide_src/source/outgoing/csp/013.php
diff --git a/user_guide_src/source/outgoing/index.rst b/user_guide_src/source/outgoing/index.rst
index 2b95096511c3..a08a2e52a125 100644
--- a/user_guide_src/source/outgoing/index.rst
+++ b/user_guide_src/source/outgoing/index.rst
@@ -16,5 +16,6 @@ View components are used to build what is returned to the user.
     table
     response
     api_responses
+    csp
     localization
     alternative_php
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 078d9d11042a..d5785756d461 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -199,122 +199,6 @@ to the ``Cache-Control`` header. You are free to set all of the options exactly
 situation. While most of the options are applied to the ``Cache-Control`` header, it intelligently handles
 the ``etag`` and ``last-modified`` options to their appropriate header.
 
-.. _content-security-policy:
-
-Content Security Policy
-=======================
-
-One of the best protections you have against XSS attacks is to implement a Content Security Policy on the site.
-This forces you to whitelist every single source of content that is pulled in from your site's HTML,
-including images, stylesheets, javascript files, etc. The browser will refuse content from sources that don't meet
-the whitelist. This whitelist is created within the response's ``Content-Security-Policy`` header and has many
-different ways it can be configured.
-
-This sounds complex, and on some sites, can definitely be challenging. For many simple sites, though, where all content
-is served by the same domain (http://example.com), it is very simple to integrate.
-
-As this is a complex subject, this user guide will not go over all of the details. For more information, you should
-visit the following sites:
-
-* `Content Security Policy main site <https://content-security-policy.com/>`_
-* `W3C Specification <https://www.w3.org/TR/CSP>`_
-* `Introduction at HTML5Rocks <https://www.html5rocks.com/en/tutorials/security/content-security-policy/>`_
-* `Article at SitePoint <https://www.sitepoint.com/improving-web-security-with-the-content-security-policy/>`_
-
-Turning CSP On
---------------
-
-.. important:: The :ref:`Debug Toolbar <the-debug-toolbar>` may use Kint, which
-    outputs inline scripts. Therefore, when CSP is turned on, CSP nonce is
-    automatically output for the Debug Toolbar. However, if you are not using
-    CSP nonce, this will change the CSP header to something you do not intend,
-    and it will behave differently than in production; if you want to verify CSP
-    behavior, turn off the Debug Toolbar.
-
-By default, support for this is off. To enable support in your application, edit the ``CSPEnabled`` value in
-**app/Config/App.php**:
-
-.. literalinclude:: response/011.php
-
-When enabled, the response object will contain an instance of ``CodeIgniter\HTTP\ContentSecurityPolicy``. The
-values set in **app/Config/ContentSecurityPolicy.php** are applied to that instance, and if no changes are
-needed during runtime, then the correctly formatted header is sent and you're all done.
-
-With CSP enabled, two header lines are added to the HTTP response: a **Content-Security-Policy** header, with
-policies identifying content types or origins that are explicitly allowed for different
-contexts, and a **Content-Security-Policy-Report-Only** header, which identifies content types
-or origins that will be allowed but which will also be reported to the destination
-of your choice.
-
-Our implementation provides for a default treatment, changeable through the ``reportOnly()`` method.
-When an additional entry is added to a CSP directive, as shown below, it will be added
-to the CSP header appropriate for blocking or preventing. That can be overridden on a per
-call basis, by providing an optional second parameter to the adding method call.
-
-Runtime Configuration
----------------------
-
-If your application needs to make changes at run-time, you can access the instance at ``$this->response->getCSP()`` in your controllers. The
-class holds a number of methods that map pretty clearly to the appropriate header value that you need to set.
-Examples are shown below, with different combinations of parameters, though all accept either a directive
-name or an array of them:
-
-.. literalinclude:: response/012.php
-
-The first parameter to each of the "add" methods is an appropriate string value,
-or an array of them.
-
-The ``reportOnly()`` method allows you to specify the default reporting treatment
-for subsequent sources, unless over-ridden. For instance, you could specify
-that youtube.com was allowed, and then provide several allowed but reported sources:
-
-.. literalinclude:: response/013.php
-
-Inline Content
---------------
-
-It is possible to set a website to not protect even inline scripts and styles on its own pages, since this might have
-been the result of user-generated content. To protect against this, CSP allows you to specify a nonce within the
-``<style>`` and ``<script>`` tags, and to add those values to the response's header. This is a pain to handle in real
-life, and is most secure when generated on the fly. To make this simple, you can include a ``{csp-style-nonce}`` or
-``{csp-script-nonce}`` placeholder in the tag and it will be handled for you automatically::
-
-    // Original
-    <script {csp-script-nonce}>
-        console.log("Script won't run as it doesn't contain a nonce attribute");
-    </script>
-
-    // Becomes
-    <script nonce="Eskdikejidojdk978Ad8jf">
-        console.log("Script won't run as it doesn't contain a nonce attribute");
-    </script>
-
-    // OR
-    <style {csp-style-nonce}>
-        . . .
-    </style>
-
-.. warning:: If an attacker injects a string like ``<script {csp-script-nonce}>``, it might become the real nonce attribute with this functionality. You can customize the placeholder string with the ``$scriptNonceTag`` and ``$styleNonceTag`` properties in **app/Config/ContentSecurityPolicy.php**.
-
-If you don't like this auto replacement functionality, you can turn it off with setting ``$autoNonce = false`` in **app/Config/ContentSecurityPolicy.php**.
-
-In this case, you can use the functions, :php:func:`csp_script_nonce()` and :php:func:`csp_style_nonce()`::
-
-    // Original
-    <script <?= csp_script_nonce() ?>>
-        console.log("Script won't run as it doesn't contain a nonce attribute");
-    </script>
-
-    // Becomes
-    <script nonce="Eskdikejidojdk978Ad8jf">
-        console.log("Script won't run as it doesn't contain a nonce attribute");
-    </script>
-
-    // OR
-    <style <?= csp_style_nonce() ?>>
-        . . .
-    </style>
-
 Class Reference
 ===============
 

From 202a8751419a3e5024b748a70619d9696be83ad3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 15:47:14 +0900
Subject: [PATCH 054/380] docs: trivail fix in sample code

---
 user_guide_src/source/outgoing/csp/011.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/csp/011.php b/user_guide_src/source/outgoing/csp/011.php
index bfac115c6bd3..193105592586 100644
--- a/user_guide_src/source/outgoing/csp/011.php
+++ b/user_guide_src/source/outgoing/csp/011.php
@@ -6,7 +6,7 @@
 
 class App extends BaseConfig
 {
-    public bool $CSPEnabled = true;
-
     // ...
+
+    public bool $CSPEnabled = true;
 }

From fd2fd4d633a2b03ff4c265b868b7fcd8d0537c70 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 15:52:10 +0900
Subject: [PATCH 055/380] docs: add (CSP)

---
 user_guide_src/source/outgoing/csp.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/csp.rst b/user_guide_src/source/outgoing/csp.rst
index b0ca5263c1ef..44eb585256db 100644
--- a/user_guide_src/source/outgoing/csp.rst
+++ b/user_guide_src/source/outgoing/csp.rst
@@ -12,7 +12,7 @@ Content Security Policy
 What is Content Security Policy?
 ********************************
 
-One of the best protections you have against XSS attacks is to implement a Content Security Policy on the site.
+One of the best protections you have against XSS attacks is to implement a Content Security Policy (CSP) on the site.
 This forces you to whitelist every single source of content that is pulled in from your site's HTML,
 including images, stylesheets, javascript files, etc. The browser will refuse content from sources that don't meet
 the whitelist. This whitelist is created within the response's ``Content-Security-Policy`` header and has many

From 178c4c07d3c181aaf74caa60b6c51bbc35c5210f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Nov 2023 15:57:29 +0900
Subject: [PATCH 056/380] docs: remove `whitelist`

---
 user_guide_src/source/outgoing/csp.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/outgoing/csp.rst b/user_guide_src/source/outgoing/csp.rst
index 44eb585256db..0761f289a611 100644
--- a/user_guide_src/source/outgoing/csp.rst
+++ b/user_guide_src/source/outgoing/csp.rst
@@ -12,11 +12,13 @@ Content Security Policy
 What is Content Security Policy?
 ********************************
 
-One of the best protections you have against XSS attacks is to implement a Content Security Policy (CSP) on the site.
-This forces you to whitelist every single source of content that is pulled in from your site's HTML,
-including images, stylesheets, javascript files, etc. The browser will refuse content from sources that don't meet
-the whitelist. This whitelist is created within the response's ``Content-Security-Policy`` header and has many
-different ways it can be configured.
+One of the best protections you have against XSS attacks is to implement a Content
+Security Policy (CSP) on the site. This requires you to specify and authorize each
+source of content that is included in your site's HTML, including images,
+stylesheets, JavaScript files, and so on. The browser will reject content from
+sources that are not explicitly approved. This authorization is defined within
+the response's ``Content-Security-Policy`` header and offers various configuration
+options.
 
 This sounds complex, and on some sites, can definitely be challenging. For many simple sites, though, where all content
 is served by the same domain (http://example.com), it is very simple to integrate.

From 6e15dad0e446a3aa4579f6ed5cb07575bbe1ecea Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 5 Nov 2023 18:46:13 +0800
Subject: [PATCH 057/380] Update to phpstan-codeigniter v1.4.2

---
 phpstan-baseline.php | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index ce98e8633277..ba2ed9354d05 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -701,21 +701,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Commands/Server/Serve.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Accessing offset \'DOCUMENT_ROOT\' directly on \\$_SERVER is discouraged\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Commands/Server/rewrite.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Accessing offset \'REQUEST_URI\' directly on \\$_SERVER is discouraged\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Server/rewrite.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Assigning \'/index\\.php\' directly on offset \'SCRIPT_NAME\' of \\$_SERVER is discouraged\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Server/rewrite.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset \'CI_ENVIRONMENT\' directly on \\$_SERVER is discouraged\\.$#',
 	'count' => 3,
@@ -3916,21 +3901,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/TestResponse.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Accessing offset \'app\\.baseURL\' directly on \\$_SERVER is discouraged\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/bootstrap.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Assigning \'http\\://example\\.com/\' directly on offset \'app\\.baseURL\' of \\$_SERVER is discouraged\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/bootstrap.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Assigning \'testing\' directly on offset \'CI_ENVIRONMENT\' of \\$_SERVER is discouraged\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/bootstrap.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#',
 	'count' => 1,

From 626a7747b361f1d09e2135bda797c3a545004b6f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Nov 2023 08:03:48 +0900
Subject: [PATCH 058/380] docs: fix incorrect label position

---
 user_guide_src/source/libraries/validation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 8ebec266c0bf..eb2c497426b2 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -309,8 +309,6 @@ To give a labeled error message you can set up as:
 .. literalinclude:: validation/007.php
    :lines: 2-
 
-.. _validation-withrequest:
-
 .. note:: ``setRules()`` will overwrite any rules that were set previously. To add more than one
     rule to an existing set of rules, use ``setRule()`` multiple times.
 
@@ -340,6 +338,8 @@ For example, data returned by multi select dropdown:
 .. literalinclude:: validation/011.php
    :lines: 2-
 
+.. _validation-withrequest:
+
 withRequest()
 =============
 

From 75907cff0152c47201f4cdd16d8f0a0f9732b7e0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Nov 2023 08:04:05 +0900
Subject: [PATCH 059/380] docs: fix comment in sample code

---
 user_guide_src/source/libraries/validation/008.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation/008.php b/user_guide_src/source/libraries/validation/008.php
index 38656dda37cb..41e37f0652ef 100644
--- a/user_guide_src/source/libraries/validation/008.php
+++ b/user_guide_src/source/libraries/validation/008.php
@@ -4,7 +4,8 @@
 $request    = \Config\Services::request();
 
 if ($validation->withRequest($request)->run()) {
-    // If you want to get the validated data.
+    // If you use the input data, you should get it from the getValidated() method.
+    // Otherwise you may create a vulnerability.
     $validData = $validation->getValidated();
 
     // ...

From 3a2cc73f05db563ecc01d7ae0e90b6117ea3d45e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Nov 2023 09:22:38 +0900
Subject: [PATCH 060/380] refactor: fix PHPStan errors

---
 phpstan-baseline.php                     | 5 -----
 system/Cache/Handlers/RedisHandler.php   | 1 +
 system/Session/Handlers/RedisHandler.php | 5 ++++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index ba2ed9354d05..451c925f373a 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -3036,11 +3036,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in a negated boolean, int given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset \'HTTP_X_REQUESTED_WITH\' directly on \\$_SERVER is discouraged\\.$#',
 	'count' => 2,
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index 42b44cd98a96..953de2dc20be 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -245,6 +245,7 @@ public function getMetaData(string $key)
         if ($value !== null) {
             $time = Time::now()->getTimestamp();
             $ttl  = $this->redis->ttl(static::validateKey($key, $this->prefix));
+            assert(is_int($ttl));
 
             return [
                 'expire' => $ttl > 0 ? $time + $ttl : null,
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index 815e3644984b..1fb87597ab8a 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -293,7 +293,10 @@ protected function lockSession(string $sessionID): bool
         $attempt = 0;
 
         do {
-            if (($ttl = $this->redis->ttl($lockKey)) > 0) {
+            $ttl = $this->redis->ttl($lockKey);
+            assert(is_int($ttl));
+
+            if ($ttl > 0) {
                 sleep(1);
 
                 continue;

From bc919912f29c168bc21a988e3b86ff3fef24ad37 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 6 Nov 2023 21:00:47 +0700
Subject: [PATCH 061/380] [Testing] Use assertEqualsWithDelta() when possible

---
 tests/system/Config/BaseConfigTest.php                 |  2 +-
 tests/system/Database/Live/SelectTest.php              |  4 ++--
 tests/system/Entity/EntityTest.php                     |  8 ++++----
 tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php | 10 +++++-----
 tests/system/HTTP/CURLRequestTest.php                  | 10 +++++-----
 tests/system/HTTP/IncomingRequestTest.php              |  4 ++--
 .../Session/Handlers/Database/RedisHandlerTest.php     |  4 ++--
 tests/system/Throttle/ThrottleTest.php                 |  2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 7c05af3a390e..6b53689d04e2 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -80,7 +80,7 @@ public function testUseDefaultValueTypeIntAndFloatValues(): void
         $dotenv->load();
         $config = new SimpleConfig();
 
-        $this->assertSame(0.0, $config->float);
+        $this->assertEqualsWithDelta(0.0, $config->float, PHP_FLOAT_EPSILON);
         $this->assertSame(999, $config->int);
     }
 
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index c32f5e116828..cd4b1a5f93d1 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -86,14 +86,14 @@ public function testSelectAvg(): void
     {
         $result = $this->db->table('job')->selectAvg('id')->get()->getRow();
 
-        $this->assertSame(2.5, (float) $result->id);
+        $this->assertEqualsWithDelta(2.5, (float) $result->id, PHP_FLOAT_EPSILON);
     }
 
     public function testSelectAvgWithAlias(): void
     {
         $result = $this->db->table('job')->selectAvg('id', 'xam')->get()->getRow();
 
-        $this->assertSame(2.5, (float) $result->xam);
+        $this->assertEqualsWithDelta(2.5, (float) $result->xam, PHP_FLOAT_EPSILON);
     }
 
     public function testSelectSum(): void
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index dadea32b5680..b02756c22406 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -373,12 +373,12 @@ public function testCastFloat(): void
         $entity->second = 3;
 
         $this->assertIsFloat($entity->second);
-        $this->assertSame(3.0, $entity->second);
+        $this->assertEqualsWithDelta(3.0, $entity->second, PHP_FLOAT_EPSILON);
 
         $entity->second = '3.6';
 
         $this->assertIsFloat($entity->second);
-        $this->assertSame(3.6, $entity->second);
+        $this->assertEqualsWithDelta(3.6, $entity->second, PHP_FLOAT_EPSILON);
     }
 
     public function testCastDouble(): void
@@ -388,12 +388,12 @@ public function testCastDouble(): void
         $entity->third = 3;
 
         $this->assertIsFloat($entity->third);
-        $this->assertSame(3.0, $entity->third);
+        $this->assertEqualsWithDelta(3.0, $entity->third, PHP_FLOAT_EPSILON);
 
         $entity->third = '3.6';
 
         $this->assertIsFloat($entity->third);
-        $this->assertSame(3.6, $entity->third);
+        $this->assertEqualsWithDelta(3.6, $entity->third, PHP_FLOAT_EPSILON);
     }
 
     public function testCastString(): void
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index a0a9ffcda4c6..d8e96424dae5 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -267,14 +267,14 @@ public function testHeaderContentLengthNotSharedBetweenClients(): void
     public function testOptionsDelay(): void
     {
         $request = $this->getRequest();
-        $this->assertSame(0.0, $request->getDelay());
+        $this->assertEqualsWithDelta(0.0, $request->getDelay(), PHP_FLOAT_EPSILON);
 
         $options = [
             'delay'   => 2000,
             'headers' => ['fruit' => 'apple'],
         ];
         $request = $this->getRequest($options);
-        $this->assertSame(2.0, $request->getDelay());
+        $this->assertEqualsWithDelta(2.0, $request->getDelay(), PHP_FLOAT_EPSILON);
     }
 
     public function testPatchSetsCorrectMethod(): void
@@ -356,10 +356,10 @@ public function testRequestSetsBasicCurlOptions(): void
         $this->assertTrue($options[CURLOPT_FRESH_CONNECT]);
 
         $this->assertArrayHasKey(CURLOPT_TIMEOUT_MS, $options);
-        $this->assertSame(0.0, $options[CURLOPT_TIMEOUT_MS]);
+        $this->assertEqualsWithDelta(0.0, $options[CURLOPT_TIMEOUT_MS], PHP_FLOAT_EPSILON);
 
         $this->assertArrayHasKey(CURLOPT_CONNECTTIMEOUT_MS, $options);
-        $this->assertSame(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS]);
+        $this->assertEqualsWithDelta(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS], PHP_FLOAT_EPSILON);
     }
 
     public function testAuthBasicOption(): void
@@ -734,7 +734,7 @@ public function testSendWithDelay(): void
         $request->get('products');
 
         // we still need to check the code coverage to make sure this was done
-        $this->assertSame(0.1, $request->getDelay());
+        $this->assertEqualsWithDelta(0.1, $request->getDelay(), PHP_FLOAT_EPSILON);
     }
 
     public function testSendContinued(): void
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index f7a1ce6fe9e7..186284da6ba6 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -250,14 +250,14 @@ public function testHeaderContentLengthNotSharedBetweenClients(): void
     public function testOptionsDelay(): void
     {
         $request = $this->getRequest();
-        $this->assertSame(0.0, $request->getDelay());
+        $this->assertEqualsWithDelta(0.0, $request->getDelay(), PHP_FLOAT_EPSILON);
 
         $options = [
             'delay'   => 2000,
             'headers' => ['fruit' => 'apple'],
         ];
         $request = $this->getRequest($options);
-        $this->assertSame(2.0, $request->getDelay());
+        $this->assertEqualsWithDelta(2.0, $request->getDelay(), PHP_FLOAT_EPSILON);
     }
 
     public function testPatchSetsCorrectMethod(): void
@@ -339,10 +339,10 @@ public function testRequestSetsBasicCurlOptions(): void
         $this->assertTrue($options[CURLOPT_FRESH_CONNECT]);
 
         $this->assertArrayHasKey(CURLOPT_TIMEOUT_MS, $options);
-        $this->assertSame(0.0, $options[CURLOPT_TIMEOUT_MS]);
+        $this->assertEqualsWithDelta(0.0, $options[CURLOPT_TIMEOUT_MS], PHP_FLOAT_EPSILON);
 
         $this->assertArrayHasKey(CURLOPT_CONNECTTIMEOUT_MS, $options);
-        $this->assertSame(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS]);
+        $this->assertEqualsWithDelta(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS], PHP_FLOAT_EPSILON);
     }
 
     public function testAuthBasicOption(): void
@@ -717,7 +717,7 @@ public function testSendWithDelay(): void
         $request->get('products');
 
         // we still need to check the code coverage to make sure this was done
-        $this->assertSame(0.1, $request->getDelay());
+        $this->assertEqualsWithDelta(0.1, $request->getDelay(), PHP_FLOAT_EPSILON);
     }
 
     public function testSendContinued(): void
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 3855a4b85c94..98fef5322df2 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -348,7 +348,7 @@ public function testCanGetAVariableFromJson(): void
         $this->assertSame('buzz', $jsonVar->fizz);
         $this->assertSame('buzz', $request->getJsonVar('baz.fizz'));
         $this->assertSame(123, $request->getJsonVar('int'));
-        $this->assertSame(3.14, $request->getJsonVar('float'));
+        $this->assertEqualsWithDelta(3.14, $request->getJsonVar('float'), PHP_FLOAT_EPSILON);
         $this->assertTrue($request->getJsonVar('true'));
         $this->assertFalse($request->getJsonVar('false'));
         $this->assertNull($request->getJsonVar('null'));
@@ -379,7 +379,7 @@ public function testGetJsonVarAsArray(): void
         $this->assertSame('buzz', $jsonVar['fizz']);
         $this->assertSame('bar', $jsonVar['foo']);
         $this->assertSame(123, $jsonVar['int']);
-        $this->assertSame(3.14, $jsonVar['float']);
+        $this->assertEqualsWithDelta(3.14, $jsonVar['float'], PHP_FLOAT_EPSILON);
         $this->assertTrue($jsonVar['true']);
         $this->assertFalse($jsonVar['false']);
         $this->assertNull($jsonVar['null']);
diff --git a/tests/system/Session/Handlers/Database/RedisHandlerTest.php b/tests/system/Session/Handlers/Database/RedisHandlerTest.php
index 94d17461d243..d5e8b61e7700 100644
--- a/tests/system/Session/Handlers/Database/RedisHandlerTest.php
+++ b/tests/system/Session/Handlers/Database/RedisHandlerTest.php
@@ -93,7 +93,7 @@ public function testSavePathTimeoutFloat(): void
 
         $savePath = $this->getPrivateProperty($handler, 'savePath');
 
-        $this->assertSame(2.5, $savePath['timeout']);
+        $this->assertEqualsWithDelta(2.5, $savePath['timeout'], PHP_FLOAT_EPSILON);
     }
 
     public function testSavePathTimeoutInt(): void
@@ -104,7 +104,7 @@ public function testSavePathTimeoutInt(): void
 
         $savePath = $this->getPrivateProperty($handler, 'savePath');
 
-        $this->assertSame(10.0, $savePath['timeout']);
+        $this->assertEqualsWithDelta(10.0, $savePath['timeout'], PHP_FLOAT_EPSILON);
     }
 
     public function testOpen(): void
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index 16d58ac506d4..1cd0abf99407 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -185,7 +185,7 @@ public function testFlooding(): void
         $throttler = $throttler->setTestTime($time + 10);
 
         $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, 0));
-        $this->assertSame(10.0, round($this->cache->get('throttler_127.0.0.1')));
+        $this->assertEqualsWithDelta(10.0, round($this->cache->get('throttler_127.0.0.1')), PHP_FLOAT_EPSILON);
     }
 
     /**

From 6293b6b5e582a88a8e2f6c7e442bb9c2028a683b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 07:11:50 +0900
Subject: [PATCH 062/380] docs: add warning to getVar() in validation.rst

---
 user_guide_src/source/libraries/validation.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index eb2c497426b2..6fc55822b71a 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -343,6 +343,13 @@ For example, data returned by multi select dropdown:
 withRequest()
 =============
 
+.. warning:: If you want to validate POST data only, don't use ``withRequest()``.
+    This method uses :ref:`$request->getVar() <incomingrequest-getting-data>`
+    which returns ``$_GET``, ``$_POST`` or ``$_COOKIE`` data in that order
+    (depending on php.ini `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_).
+    Newer values override older values. POST values may be overridden by the
+    cookies if they have the same name.
+
 One of the most common times you will use the validation library is when validating
 data that was input from an HTTP Request. If desired, you can pass an instance of the
 current Request object and it will take all of the input data and set it as the

From 1149f271913f32ce57ff9adceca721bd1b952067 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 07:12:15 +0900
Subject: [PATCH 063/380] docs: add warning to getVar() in incomingrequest.rst

---
 user_guide_src/source/incoming/incomingrequest.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 5a58ea1c1608..d3b04bd0c698 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -101,6 +101,11 @@ Getting Data
 
 The ``getVar()`` method will pull from ``$_REQUEST``, so will return any data from ``$_GET``, ``$POST``, or ``$_COOKIE`` (depending on php.ini `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_).
 
+.. warning:: If you want to validate POST data only, don't use ``getVar()``.
+    Newer values override older values. POST values may be overridden by the
+    cookies if they have the same name, and you set "C" after "P" in
+    `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_.
+
 .. note:: If the incoming request has a ``Content-Type`` header set to ``application/json``,
     the ``getVar()`` method returns the JSON data instead of ``$_REQUEST`` data.
 

From 82c2977813c0a28201379c141e0de7d092b1adf1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 09:35:02 +0900
Subject: [PATCH 064/380] test: fix typo in method name

---
 tests/system/HTTP/IncomingRequestTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 3855a4b85c94..0211dccacef6 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -518,7 +518,7 @@ public function testGetJsonVarReturnsNullFromNullBody(): void
         $this->assertNull($request->getJsonVar('myKey'));
     }
 
-    public function testgetJSONReturnsNullFromNullBody(): void
+    public function testGetJSONReturnsNullFromNullBody(): void
     {
         $config          = new App();
         $config->baseURL = 'http://example.com/';

From ee34dcaedb1af465124a8fb72135ee5dd0e32b7f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 09:36:46 +0900
Subject: [PATCH 065/380] test: rename test method

---
 tests/system/HTTP/IncomingRequestTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 0211dccacef6..4830837c1fb6 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -847,7 +847,7 @@ public function testGetPostSecondStreams(): void
         $this->assertSame(array_merge($_POST, $_GET), $this->request->getGetPost());
     }
 
-    public function testWithFalseBody(): void
+    public function testGetBodyWithFalseBody(): void
     {
         // Use `false` here to simulate file_get_contents returning a false value
         $request = $this->createRequest(null, false);

From 5e4e13bb59b578267d349ecd46f1a8d3a28a024f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 09:46:48 +0900
Subject: [PATCH 066/380] test: add test when body is '0'

---
 tests/system/HTTP/IncomingRequestTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 4830837c1fb6..cfc26a988857 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -856,6 +856,13 @@ public function testGetBodyWithFalseBody(): void
         $this->assertNull($request->getBody());
     }
 
+    public function testGetBodyWithZero(): void
+    {
+        $request = $this->createRequest(null, '0');
+
+        $this->assertSame('0', $request->getBody());
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/3020
      */

From 05966db888ddd749d1f69e60c11bdf12f2444b8b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 09:47:42 +0900
Subject: [PATCH 067/380] fix: bug that if body is '0', $this->body will be
 null

---
 system/HTTP/IncomingRequest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 079a3b69d02f..307a78d38b4a 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -169,9 +169,14 @@ public function __construct($config, ?URI $uri = null, $body = 'php://input', ?U
             $body = file_get_contents('php://input');
         }
 
+        // If file_get_contents() returns false or empty string, set null.
+        if ($body === false || $body === '') {
+            $body = null;
+        }
+
         $this->config       = $config;
         $this->uri          = $uri;
-        $this->body         = ! empty($body) ? $body : null;
+        $this->body         = $body;
         $this->userAgent    = $userAgent;
         $this->validLocales = $config->supportedLocales;
 

From 42be01d92566eb2b946435be40b4f26cd84131b9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 09:51:36 +0900
Subject: [PATCH 068/380] chore: update phpstan-baseline.php

---
 phpstan-baseline.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 451c925f373a..3cbe5a4732fc 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -2148,7 +2148,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 5,
 	'path' => __DIR__ . '/system/HTTP/IncomingRequest.php',
 ];
 $ignoreErrors[] = [

From 5c55c435e4db9e38afe6a5292e3366e9cf5d5f3b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 11:14:47 +0900
Subject: [PATCH 069/380] docs: fix return type for lang()

---
 system/Common.php            | 2 +-
 system/Language/Language.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 9ad7fe5b842b..2d876564846e 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -755,7 +755,7 @@ function is_windows(?bool $mock = null): bool
      * A convenience method to translate a string or array of them and format
      * the result with the intl extension's MessageFormatter.
      *
-     * @return string
+     * @return list<string>|string
      */
     function lang(string $line, array $args = [], ?string $locale = null)
     {
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 32eee39f2a13..8633f8a2dd9c 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -88,7 +88,7 @@ public function getLocale(): string
      * Parses the language string for a file, loads the file, if necessary,
      * getting the line.
      *
-     * @return string|string[]
+     * @return list<string>|string
      */
     public function getLine(string $line, array $args = [])
     {

From 1b0d777eefab1191fc243932668cb64539a36edc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 13:06:09 +0900
Subject: [PATCH 070/380] docs: add warning about Cookie based CSRF protection

---
 user_guide_src/source/libraries/security.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 6c39cbefdb5e..407b99725103 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -71,6 +71,12 @@ Config for CSRF
 CSRF Protection Methods
 -----------------------
 
+.. warning:: If you use :doc:`Session <./sessions>`, be sure to use Session based
+    CSRF protection. Cookie based CSRF protection will not prevent Same-site attacks.
+    See
+    `GHSA-5hm8-vh6r-2cjq <https://github.com/codeigniter4/shield/security/advisories/GHSA-5hm8-vh6r-2cjq>`_
+    for details.
+
 By default, the Cookie based CSRF Protection is used. It is
 `Double Submit Cookie <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#double-submit-cookie>`_
 on OWASP Cross-Site Request Forgery Prevention Cheat Sheet.

From d389049d031550e776ad99ab033b16b075448d65 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 13:37:48 +0900
Subject: [PATCH 071/380] docs: add explanation about redirect and
 Cookies/Headers

---
 user_guide_src/source/outgoing/response.rst   | 35 +++++++++++++++++--
 .../source/outgoing/response/031.php          |  6 ----
 .../source/outgoing/response/034.php          |  4 +++
 .../source/outgoing/response/035.php          |  4 +++
 4 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 user_guide_src/source/outgoing/response/034.php
 create mode 100644 user_guide_src/source/outgoing/response/035.php

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index d5785756d461..539c99180eaa 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -64,8 +64,15 @@ parameter. This is not case-sensitive.
 Redirect
 ========
 
-If you want to create a redirect, use the :php:func:`redirect()` function. It
-returns a ``RedirectResponse`` instance.
+If you want to create a redirect, use the :php:func:`redirect()` function.
+
+It returns a ``RedirectResponse`` instance. It is a different instance from the
+global response instance that ``Services::response()`` returns.
+
+.. warning:: If you set Cookies or Response Headers before you call ``redirect()``,
+    they are set to the global response instance, and they are not automatically
+    copied to the ``RedirectResponse`` instance. To send them, you need to call
+    the ``withCookies()`` or ``withHeaders()`` method manually.
 
 .. important:: If you want to redirect, an instance of ``RedirectResponse`` must
     be returned in a method of the :doc:`Controller <../incoming/controllers>` or
@@ -113,6 +120,30 @@ When you want to redirect back, use ``redirect()->back()``:
     It takes a visitor to "the last page viewed during the Session" when the Session is available.
     If the Session hasn't been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used.
 
+Redirect with Cookies
+---------------------
+
+If you set Cookies before you call ``redirect()``, they are set to the global
+response instance, and they are not automatically copied to the ``RedirectResponse``
+instance.
+
+To send the Cookies, you need to call the ``withCookies()`` method manually.
+
+.. literalinclude:: ./response/034.php
+    :lines: 2-
+
+Redirect with Headers
+---------------------
+
+If you set Response Headers before you call ``redirect()``, they are set to the
+global response instance, and they are not automatically copied to the
+``RedirectResponse`` instance.
+
+To send the Headers, you need to call the ``withHeaders()`` method manually.
+
+.. literalinclude:: ./response/035.php
+    :lines: 2-
+
 .. _response-redirect-status-code:
 
 Redirect Status Code
diff --git a/user_guide_src/source/outgoing/response/031.php b/user_guide_src/source/outgoing/response/031.php
index 28b73d6c267c..bd24e1512f09 100644
--- a/user_guide_src/source/outgoing/response/031.php
+++ b/user_guide_src/source/outgoing/response/031.php
@@ -8,9 +8,3 @@
 
 // Set a flash message.
 return redirect()->back()->with('foo', 'message');
-
-// Copies all cookies from global response instance.
-return redirect()->back()->withCookies();
-
-// Copies all headers from the global response instance.
-return redirect()->back()->withHeaders();
diff --git a/user_guide_src/source/outgoing/response/034.php b/user_guide_src/source/outgoing/response/034.php
new file mode 100644
index 000000000000..32c56afe6da6
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/034.php
@@ -0,0 +1,4 @@
+<?php
+
+// Copies all cookies from global response instance.
+return redirect()->back()->withCookies();
diff --git a/user_guide_src/source/outgoing/response/035.php b/user_guide_src/source/outgoing/response/035.php
new file mode 100644
index 000000000000..3ac3578d21f0
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/035.php
@@ -0,0 +1,4 @@
+<?php
+
+// Copies all headers from the global response instance.
+return redirect()->back()->withHeaders();

From fc169d94ec1cfeb8efdd617393d89c34ae5c93df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 13:53:05 +0900
Subject: [PATCH 072/380] docs: update outdated description

---
 user_guide_src/source/libraries/security.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 6c39cbefdb5e..a901e74c80a0 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -101,7 +101,9 @@ Token Regeneration
 ------------------
 
 Tokens may be either regenerated on every submission (default) or
-kept the same throughout the life of the CSRF cookie. The default
+kept the same throughout the life of the Session or CSRF cookie.
+
+The default
 regeneration of tokens provides stricter security, but may result
 in usability concerns as other tokens become invalid (back/forward
 navigation, multiple tabs/windows, asynchronous actions, etc). You

From 79ec2699677ae685d414396725702207e59fc8b4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 13:54:04 +0900
Subject: [PATCH 073/380] docs: add warning on redirect()

---
 user_guide_src/source/libraries/security.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index a901e74c80a0..d1cdb52194c8 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -112,6 +112,10 @@ may alter this behavior by editing the following config parameter value in
 
 .. literalinclude:: security/004.php
 
+.. warning:: If you use Cookie based CSRF protection, and :php:func:`redirect()`
+    after the submission, you must call ``withCookie()`` to send the regenerated
+    CSRF cookie. See :ref:`response-redirect` for details.
+
 .. note:: Since v4.2.3, you can regenerate CSRF token manually with the
     ``Security::generateHash()`` method.
 

From fe5db1837b775215150296ef5ad510658611cd8f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Nov 2023 20:35:37 +0900
Subject: [PATCH 074/380] fix: replace {locale} with default locale in
 SampleURIGenerator

---
 system/Commands/Utilities/Routes/SampleURIGenerator.php  | 9 +++++++++
 .../Commands/Utilities/Routes/SampleURIGeneratorTest.php | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/system/Commands/Utilities/Routes/SampleURIGenerator.php b/system/Commands/Utilities/Routes/SampleURIGenerator.php
index 38b333fd33c2..43d1934438bb 100644
--- a/system/Commands/Utilities/Routes/SampleURIGenerator.php
+++ b/system/Commands/Utilities/Routes/SampleURIGenerator.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollection;
+use Config\App;
 
 /**
  * Generate a sample URI path from route key regex.
@@ -51,6 +52,14 @@ public function get(string $routeKey): string
     {
         $sampleUri = $routeKey;
 
+        if (strpos($routeKey, '{locale}') !== false) {
+            $sampleUri = str_replace(
+                '{locale}',
+                config(App::class)->defaultLocale,
+                $routeKey
+            );
+        }
+
         foreach ($this->routes->getPlaceholders() as $placeholder => $regex) {
             $sample = $this->samples[$placeholder] ?? '::unknown::';
 
diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
index 4f7d6221665d..5f490be437e1 100644
--- a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
+++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
@@ -40,6 +40,8 @@ public static function provideGet(): iterable
             'placeholder num'     => ['shop/product/([0-9]+)', 'shop/product/123'],
             'placeholder segment' => ['shop/product/([^/]+)', 'shop/product/abc_123'],
             'placeholder any'     => ['shop/product/(.*)', 'shop/product/123/abc'],
+            'locale'              => ['{locale}/home', 'en/home'],
+            'locale segment'      => ['{locale}/product/([^/]+)', 'en/product/abc_123'],
             'auto route'          => ['home/index[/...]', 'home/index/1/2/3/4/5'],
         ];
     }

From 71a1558cb774a35c6e62315a602e7e4e00938cc6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 08:51:10 +0900
Subject: [PATCH 075/380] docs: add sub section titles

---
 user_guide_src/source/incoming/incomingrequest.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index d3b04bd0c698..95c2b570dc6a 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -99,6 +99,9 @@ With CodeIgniter's built-in methods you can simply do this:
 Getting Data
 ============
 
+getVar()
+--------
+
 The ``getVar()`` method will pull from ``$_REQUEST``, so will return any data from ``$_GET``, ``$POST``, or ``$_COOKIE`` (depending on php.ini `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_).
 
 .. warning:: If you want to validate POST data only, don't use ``getVar()``.
@@ -109,6 +112,9 @@ The ``getVar()`` method will pull from ``$_REQUEST``, so will return any data fr
 .. note:: If the incoming request has a ``Content-Type`` header set to ``application/json``,
     the ``getVar()`` method returns the JSON data instead of ``$_REQUEST`` data.
 
+get*()
+------
+
 While this
 is convenient, you will often need to use a more specific method, like:
 

From 4647fe3046ed4b469d4571ed6381265fe50546f8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 08:59:09 +0900
Subject: [PATCH 076/380] docs: add missing $_COOKIE

---
 user_guide_src/source/incoming/incomingrequest.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 95c2b570dc6a..26ee9857ed76 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -76,7 +76,8 @@ You can also check if the request was made through and HTTPS connection with the
 Retrieving Input
 ****************
 
-You can retrieve input from ``$_SERVER``, ``$_GET``, ``$_POST``, and ``$_ENV`` through the Request object.
+You can retrieve input from ``$_GET``, ``$_POST``, ``$_COOKIE``, ``$_SERVER``
+and ``$_ENV`` through the Request object.
 The data is not automatically filtered and returns the raw input data as passed in the request.
 
 .. note:: It is bad practice to use global variables. Basically, it should be avoided

From 2032f7d50b53bc6c407d185e1c5488f7538c6c7e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 08:59:25 +0900
Subject: [PATCH 077/380] docs: fix incorrect sample code

getVar() is not guaranteed to get POST data.
---
 user_guide_src/source/incoming/incomingrequest/008.php | 2 +-
 user_guide_src/source/incoming/incomingrequest/014.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest/008.php b/user_guide_src/source/incoming/incomingrequest/008.php
index c1ee739bf50c..1f75ce279958 100644
--- a/user_guide_src/source/incoming/incomingrequest/008.php
+++ b/user_guide_src/source/incoming/incomingrequest/008.php
@@ -1,3 +1,3 @@
 <?php
 
-$something = $request->getVar('foo');
+$something = $request->getPost('foo');
diff --git a/user_guide_src/source/incoming/incomingrequest/014.php b/user_guide_src/source/incoming/incomingrequest/014.php
index 564fc543143b..8455402e59b9 100644
--- a/user_guide_src/source/incoming/incomingrequest/014.php
+++ b/user_guide_src/source/incoming/incomingrequest/014.php
@@ -1,3 +1,3 @@
 <?php
 
-$email = $request->getVar('email', FILTER_SANITIZE_EMAIL);
+$email = $request->getPost('email', FILTER_SANITIZE_EMAIL);

From 4e48de908d41241476aecde49936d85626067241 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:01:36 +0900
Subject: [PATCH 078/380] docs: move getVar() section down

The method is not recommended.
---
 .../source/incoming/incomingrequest.rst       | 58 ++++++++++++++-----
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 26ee9857ed76..f111fa44c22d 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -100,37 +100,67 @@ With CodeIgniter's built-in methods you can simply do this:
 Getting Data
 ============
 
-getVar()
+getGet()
 --------
 
-The ``getVar()`` method will pull from ``$_REQUEST``, so will return any data from ``$_GET``, ``$POST``, or ``$_COOKIE`` (depending on php.ini `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_).
-
-.. warning:: If you want to validate POST data only, don't use ``getVar()``.
-    Newer values override older values. POST values may be overridden by the
-    cookies if they have the same name, and you set "C" after "P" in
-    `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_.
+The ``getGet()`` method will pull from ``$_GET``.
 
-.. note:: If the incoming request has a ``Content-Type`` header set to ``application/json``,
-    the ``getVar()`` method returns the JSON data instead of ``$_REQUEST`` data.
+* ``$request->getGet()``
 
-get*()
-------
+getPost()
+---------
 
-While this
-is convenient, you will often need to use a more specific method, like:
+The ``getPost()`` method will pull from ``$_POST``.
 
-* ``$request->getGet()``
 * ``$request->getPost()``
+
+getCookie()
+-----------
+
+The ``getCookie()`` method will pull from ``$_COOKIE``.
+
 * ``$request->getCookie()``
+
+getServer()
+-----------
+
+The ``getServer()`` method will pull from ``$_SERVER``.
+
 * ``$request->getServer()``
+
+getEnv()
+--------
+
+The ``getEnv()`` method will pull from ``$_ENV``.
+
 * ``$request->getEnv()``
 
+getPostGet()
+------------
+
 In addition, there are a few utility methods for retrieving information from either ``$_GET`` or ``$_POST``, while
 maintaining the ability to control the order you look for it:
 
 * ``$request->getPostGet()`` - checks ``$_POST`` first, then ``$_GET``
+
+getGetPost()
+------------
+
 * ``$request->getGetPost()`` - checks ``$_GET`` first, then ``$_POST``
 
+getVar()
+--------
+
+The ``getVar()`` method will pull from ``$_REQUEST``, so will return any data from ``$_GET``, ``$POST``, or ``$_COOKIE`` (depending on php.ini `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_).
+
+.. warning:: If you want to validate POST data only, don't use ``getVar()``.
+    Newer values override older values. POST values may be overridden by the
+    cookies if they have the same name, and you set "C" after "P" in
+    `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_.
+
+.. note:: If the incoming request has a ``Content-Type`` header set to ``application/json``,
+    the ``getVar()`` method returns the JSON data instead of ``$_REQUEST`` data.
+
 .. _incomingrequest-getting-json-data:
 
 Getting JSON Data

From ed117dccbdeec230cfb01e85d4edb38cfff31f1f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:06:12 +0900
Subject: [PATCH 079/380] docs: fix indent

---
 user_guide_src/source/incoming/incomingrequest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index f111fa44c22d..659861fd4595 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -417,7 +417,7 @@ The methods provided by the parent classes that are available are:
         :returns:       ``$_POST`` if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: array|bool|float|int|object|string|null
 
-            This method is identical to ``getVar()``, only it fetches POST data.
+        This method is identical to ``getVar()``, only it fetches POST data.
 
     .. php:method:: getPostGet([$index = null[, $filter = null[, $flags = null]]])
 

From d46f10a2413aa979dd678ae32ac699a0325bc8e7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:07:39 +0900
Subject: [PATCH 080/380] docs: fix incorrect descriptions

getVar() does not return POST items.
---
 user_guide_src/source/incoming/incomingrequest.rst     | 6 +++---
 user_guide_src/source/incoming/incomingrequest/029.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 659861fd4595..31894ce50e4c 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -378,15 +378,15 @@ The methods provided by the parent classes that are available are:
 
         .. literalinclude:: incomingrequest/028.php
 
-        To return an array of all POST items call without any parameters.
+        To return an array of all REQUEST items call without any parameters.
 
-        To return all POST items and pass them through the filter, set the
+        To return all REQUEST items and pass them through the filter, set the
         first parameter to null while setting the second parameter to the filter
         you want to use:
 
         .. literalinclude:: incomingrequest/029.php
 
-        To return an array of multiple POST parameters, pass all the required keys as an array:
+        To return an array of multiple REQUEST parameters, pass all the required keys as an array:
 
         .. literalinclude:: incomingrequest/030.php
 
diff --git a/user_guide_src/source/incoming/incomingrequest/029.php b/user_guide_src/source/incoming/incomingrequest/029.php
index 62390522b9b6..98da556e20a8 100644
--- a/user_guide_src/source/incoming/incomingrequest/029.php
+++ b/user_guide_src/source/incoming/incomingrequest/029.php
@@ -1,4 +1,4 @@
 <?php
 
 $request->getVar(null, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-// returns all POST items with string sanitation
+// returns all REQUEST items with string sanitation

From d0c1d5b6e5d08e4997492ab15a1e823fc1a50956 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:16:07 +0900
Subject: [PATCH 081/380] docs: add explanations to getGet()

getVar() is not recommended.
---
 .../source/incoming/incomingrequest.rst       | 29 ++++++++++++++++++-
 .../source/incoming/incomingrequest/041.php   |  3 ++
 .../source/incoming/incomingrequest/042.php   |  3 ++
 .../source/incoming/incomingrequest/043.php   |  4 +++
 .../source/incoming/incomingrequest/044.php   |  3 ++
 .../source/incoming/incomingrequest/045.php   |  3 ++
 6 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 user_guide_src/source/incoming/incomingrequest/041.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/042.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/043.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/044.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/045.php

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 31894ce50e4c..714446ee66e6 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -405,7 +405,34 @@ The methods provided by the parent classes that are available are:
         :returns:       ``$_GET`` if no parameters supplied, otherwise the GET value if found, or null if not
         :rtype: array|bool|float|int|object|string|null
 
-        This method is identical to ``getVar()``, only it fetches GET data.
+        The first parameter will contain the name of the GET item you are looking for:
+
+        .. literalinclude:: incomingrequest/041.php
+
+        The method returns null if the item you are attempting to retrieve
+        does not exist.
+
+        The second optional parameter lets you run the data through the PHP's
+        filters. Pass in the desired filter type as the second parameter:
+
+        .. literalinclude:: incomingrequest/042.php
+
+        To return an array of all GET items call without any parameters.
+
+        To return all REQUEST items and pass them through the filter, set the
+        first parameter to null while setting the second parameter to the filter
+        you want to use:
+
+        .. literalinclude:: incomingrequest/043.php
+
+        To return an array of multiple GET parameters, pass all the required keys as an array:
+
+        .. literalinclude:: incomingrequest/044.php
+
+        Same rule applied here, to retrieve the parameters with filtering, set the second parameter to
+        the filter type to apply:
+
+        .. literalinclude:: incomingrequest/045.php
 
     .. php:method:: getPost([$index = null[, $filter = null[, $flags = null]]])
 
diff --git a/user_guide_src/source/incoming/incomingrequest/041.php b/user_guide_src/source/incoming/incomingrequest/041.php
new file mode 100644
index 000000000000..b05ea2336c45
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/041.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getGet('some_data');
diff --git a/user_guide_src/source/incoming/incomingrequest/042.php b/user_guide_src/source/incoming/incomingrequest/042.php
new file mode 100644
index 000000000000..567b26454336
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/042.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getGet('some_data', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
diff --git a/user_guide_src/source/incoming/incomingrequest/043.php b/user_guide_src/source/incoming/incomingrequest/043.php
new file mode 100644
index 000000000000..4bd67d42046c
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/043.php
@@ -0,0 +1,4 @@
+<?php
+
+$request->getGet(null, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+// returns all GET items with string sanitation
diff --git a/user_guide_src/source/incoming/incomingrequest/044.php b/user_guide_src/source/incoming/incomingrequest/044.php
new file mode 100644
index 000000000000..3e482e7a8ad4
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/044.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getGet(['field1', 'field2']);
diff --git a/user_guide_src/source/incoming/incomingrequest/045.php b/user_guide_src/source/incoming/incomingrequest/045.php
new file mode 100644
index 000000000000..b0b0de81e1cd
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/045.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getGet(['field1', 'field2'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);

From 66b8e26fed143536cd1039dbdcc6347b0eeedc5e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:20:15 +0900
Subject: [PATCH 082/380] docs: remove detailed explanations in getVar()

getVar() is not recommended.
---
 .../source/incoming/incomingrequest.rst       | 31 ++-----------------
 .../source/incoming/incomingrequest/027.php   |  3 --
 .../source/incoming/incomingrequest/028.php   |  3 --
 .../source/incoming/incomingrequest/029.php   |  4 ---
 .../source/incoming/incomingrequest/030.php   |  3 --
 .../source/incoming/incomingrequest/031.php   |  3 --
 6 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 user_guide_src/source/incoming/incomingrequest/027.php
 delete mode 100644 user_guide_src/source/incoming/incomingrequest/028.php
 delete mode 100644 user_guide_src/source/incoming/incomingrequest/029.php
 delete mode 100644 user_guide_src/source/incoming/incomingrequest/030.php
 delete mode 100644 user_guide_src/source/incoming/incomingrequest/031.php

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 714446ee66e6..d7a268dfec24 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -366,34 +366,7 @@ The methods provided by the parent classes that are available are:
         :returns:   ``$_REQUEST`` if no parameters supplied, otherwise the REQUEST value if found, or null if not
         :rtype: array|bool|float|int|object|string|null
 
-        The first parameter will contain the name of the REQUEST item you are looking for:
-
-        .. literalinclude:: incomingrequest/027.php
-
-        The method returns null if the item you are attempting to retrieve
-        does not exist.
-
-        The second optional parameter lets you run the data through the PHP's
-        filters. Pass in the desired filter type as the second parameter:
-
-        .. literalinclude:: incomingrequest/028.php
-
-        To return an array of all REQUEST items call without any parameters.
-
-        To return all REQUEST items and pass them through the filter, set the
-        first parameter to null while setting the second parameter to the filter
-        you want to use:
-
-        .. literalinclude:: incomingrequest/029.php
-
-        To return an array of multiple REQUEST parameters, pass all the required keys as an array:
-
-        .. literalinclude:: incomingrequest/030.php
-
-        Same rule applied here, to retrieve the parameters with filtering, set the second parameter to
-        the filter type to apply:
-
-        .. literalinclude:: incomingrequest/031.php
+        This method is identical to ``getGet()``, only it fetches REQUEST data.
 
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
 
@@ -444,7 +417,7 @@ The methods provided by the parent classes that are available are:
         :returns:       ``$_POST`` if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: array|bool|float|int|object|string|null
 
-        This method is identical to ``getVar()``, only it fetches POST data.
+        This method is identical to ``getGet()``, only it fetches POST data.
 
     .. php:method:: getPostGet([$index = null[, $filter = null[, $flags = null]]])
 
diff --git a/user_guide_src/source/incoming/incomingrequest/027.php b/user_guide_src/source/incoming/incomingrequest/027.php
deleted file mode 100644
index aa4f01787b4b..000000000000
--- a/user_guide_src/source/incoming/incomingrequest/027.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$request->getVar('some_data');
diff --git a/user_guide_src/source/incoming/incomingrequest/028.php b/user_guide_src/source/incoming/incomingrequest/028.php
deleted file mode 100644
index 3bc49822b301..000000000000
--- a/user_guide_src/source/incoming/incomingrequest/028.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$request->getVar('some_data', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
diff --git a/user_guide_src/source/incoming/incomingrequest/029.php b/user_guide_src/source/incoming/incomingrequest/029.php
deleted file mode 100644
index 98da556e20a8..000000000000
--- a/user_guide_src/source/incoming/incomingrequest/029.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$request->getVar(null, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-// returns all REQUEST items with string sanitation
diff --git a/user_guide_src/source/incoming/incomingrequest/030.php b/user_guide_src/source/incoming/incomingrequest/030.php
deleted file mode 100644
index 9e555a2f3143..000000000000
--- a/user_guide_src/source/incoming/incomingrequest/030.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$request->getVar(['field1', 'field2']);
diff --git a/user_guide_src/source/incoming/incomingrequest/031.php b/user_guide_src/source/incoming/incomingrequest/031.php
deleted file mode 100644
index 98c6f35e367d..000000000000
--- a/user_guide_src/source/incoming/incomingrequest/031.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$request->getVar(['field1', 'field2'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);

From 79e517dbcfdf2e71ae32d43804ab2ad0b9d0ae3a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:22:56 +0900
Subject: [PATCH 083/380] docs: fix replacement mistake

---
 user_guide_src/source/incoming/incomingrequest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index d7a268dfec24..91fd26fcb6aa 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -492,7 +492,7 @@ The methods provided by the parent classes that are available are:
         :rtype: array|bool|float|int|object|string|null
 
         This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()``
-        methods, only it fetches getServer data (``$_SERVER``):
+        methods, only it fetches Server data (``$_SERVER``):
 
         .. literalinclude:: incomingrequest/036.php
 

From 9f46435d4f9f3c9c88e4078a966a44d9d1fc40e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:24:12 +0900
Subject: [PATCH 084/380] docs: fix outdated description

---
 user_guide_src/source/incoming/incomingrequest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 91fd26fcb6aa..45336f3397e4 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -508,7 +508,7 @@ The methods provided by the parent classes that are available are:
         :returns:  The User Agent string, as found in the SERVER data, or null if not found.
         :rtype: CodeIgniter\\HTTP\\UserAgent
 
-        This method returns the User Agent string from the SERVER data:
+        This method returns the User Agent instance from the SERVER data:
 
         .. literalinclude:: incomingrequest/038.php
 

From 76789fd495307a3fc7571b848c7b2ba0271a5655 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:26:31 +0900
Subject: [PATCH 085/380] docs: add () after function name

---
 user_guide_src/source/incoming/incomingrequest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 45336f3397e4..ffcd68e1e14a 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -177,7 +177,7 @@ By default, this will return any objects in the JSON data as objects. If you wan
 arrays, pass in ``true`` as the first parameter.
 
 The second and third parameters match up to the ``depth`` and ``options`` arguments of the
-`json_decode <https://www.php.net/manual/en/function.json-decode.php>`_ PHP function.
+`json_decode() <https://www.php.net/manual/en/function.json-decode.php>`_ PHP function.
 
 If the incoming request has a ``Content-Type`` header set to ``application/json``, you can also use ``getVar()`` to get
 the JSON stream. Using ``getVar()`` in this way will always return an object.

From e6faa70e51ed3b6e7f1d43235d2d2d919110b48b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:31:34 +0900
Subject: [PATCH 086/380] docs: remove description

getVar() is not recommended.
---
 user_guide_src/source/incoming/incomingrequest.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index ffcd68e1e14a..fe7d46859ba7 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -179,9 +179,6 @@ arrays, pass in ``true`` as the first parameter.
 The second and third parameters match up to the ``depth`` and ``options`` arguments of the
 `json_decode() <https://www.php.net/manual/en/function.json-decode.php>`_ PHP function.
 
-If the incoming request has a ``Content-Type`` header set to ``application/json``, you can also use ``getVar()`` to get
-the JSON stream. Using ``getVar()`` in this way will always return an object.
-
 Getting Specific Data from JSON
 ===============================
 

From 1e07684cfbd2d450a589d16808d591ec0b8738df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:36:27 +0900
Subject: [PATCH 087/380] docs: fix param names

---
 user_guide_src/source/incoming/incomingrequest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index fe7d46859ba7..d1fad9b7724f 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -176,7 +176,7 @@ You can grab the contents of ``php://input`` as a JSON stream with ``getJSON()``
 By default, this will return any objects in the JSON data as objects. If you want that converted to associative
 arrays, pass in ``true`` as the first parameter.
 
-The second and third parameters match up to the ``depth`` and ``options`` arguments of the
+The second and third parameters match up to the ``$depth`` and ``$flags`` arguments of the
 `json_decode() <https://www.php.net/manual/en/function.json-decode.php>`_ PHP function.
 
 Getting Specific Data from JSON

From 099a884e925be54351da62f8b88b03741fca41b3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:39:46 +0900
Subject: [PATCH 088/380] docs: replace getVar() with getJsonVar()

getVar() is not recommended.
---
 user_guide_src/source/incoming/incomingrequest.rst     | 7 +++----
 user_guide_src/source/incoming/incomingrequest/010.php | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index d1fad9b7724f..ab79d6c149d8 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -182,14 +182,13 @@ The second and third parameters match up to the ``$depth`` and ``$flags`` argume
 Getting Specific Data from JSON
 ===============================
 
-You can get a specific piece of data from a JSON stream by passing a variable name into ``getVar()`` for the
+You can get a specific piece of data from a JSON stream by passing a variable name into ``getJsonVar()`` for the
 data that you want or you can use "dot" notation to dig into the JSON to get data that is not on the root level.
 
 .. literalinclude:: incomingrequest/010.php
 
-If you want the result to be an associative array instead of an object, you can use ``getJsonVar()`` instead and pass
-true in the second parameter. This function can also be used if you can't guarantee that the incoming request will have the
-correct ``Content-Type`` header.
+If you want the result to be an associative array instead of an object, you can
+pass true in the second parameter:
 
 .. literalinclude:: incomingrequest/011.php
 
diff --git a/user_guide_src/source/incoming/incomingrequest/010.php b/user_guide_src/source/incoming/incomingrequest/010.php
index a199c91bffe2..cf9824d8cd6e 100644
--- a/user_guide_src/source/incoming/incomingrequest/010.php
+++ b/user_guide_src/source/incoming/incomingrequest/010.php
@@ -10,8 +10,8 @@
  * }
  */
 
-$data = $request->getVar('foo');
+$data = $request->getJsonVar('foo');
 // $data = "bar"
 
-$data = $request->getVar('fizz.buzz');
+$data = $request->getJsonVar('fizz.buzz');
 // $data = "baz"

From e3c0edcda4cd10bf9f523cc5585078e7b4af4c0c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:44:24 +0900
Subject: [PATCH 089/380] docs: replace `here` with meaningful text

The anchor text `here` is not recommened.
---
 .../source/incoming/incomingrequest.rst       | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index ab79d6c149d8..f2d8d02f8cf2 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -355,10 +355,10 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getVar([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be found
-                        `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found
-                        `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :param  int     $filter: The type of filter to apply. A list of filters can be found in
+                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param  int     $flags: Flags to apply. A list of flags can be found in
+                        `Filter flags <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:   ``$_REQUEST`` if no parameters supplied, otherwise the REQUEST value if found, or null if not
         :rtype: array|bool|float|int|object|string|null
 
@@ -367,10 +367,10 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be
-                        found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found
-                        `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :param  int     $filter: The type of filter to apply. A list of filters can be found in
+                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param  int     $flags: Flags to apply. A list of flags can be found in
+                        `Filter flags <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       ``$_GET`` if no parameters supplied, otherwise the GET value if found, or null if not
         :rtype: array|bool|float|int|object|string|null
 
@@ -418,10 +418,10 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getPostGet([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be
-                        found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found
-                        `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :param  int     $filter: The type of filter to apply. A list of filters can be found in
+                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param  int     $flags: Flags to apply. A list of flags can be found in
+                        `Filter flags <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       ``$_POST`` and ``$_GET`` combined if no parameters specified (prefer POST value on conflict),
                         otherwise looks for POST value, if nothing found looks for GET value, if no value found returns null
         :rtype: array|bool|float|int|object|string|null
@@ -438,10 +438,10 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getGetPost([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be
-                        found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found
-                        `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :param  int     $filter: The type of filter to apply. A list of filters can be found in
+                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param  int     $flags: Flags to apply. A list of flags can be found in
+                        `Filter flags <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       ``$_GET`` and ``$_POST`` combined if no parameters specified (prefer GET value on conflict),
                         otherwise looks for GET value, if nothing found looks for POST value, if no value found returns null
         :rtype: array|bool|float|int|object|string|null
@@ -458,10 +458,10 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getCookie([$index = null[, $filter = null[, $flags = null]]])
 
         :param  array|string|null    $index: COOKIE name
-        :param  int     $filter: The type of filter to apply. A list of filters can be
-                        found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found
-                        `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :param  int     $filter: The type of filter to apply. A list of filters can be found in
+                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param  int     $flags: Flags to apply. A list of flags can be found in
+                        `Filter flags <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:        ``$_COOKIE`` if no parameters supplied, otherwise the COOKIE value if found or null if not
         :rtype: array|bool|float|int|object|string|null
 
@@ -480,10 +480,10 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getServer([$index = null[, $filter = null[, $flags = null]]])
 
         :param  array|string|null    $index: Value name
-        :param  int     $filter: The type of filter to apply. A list of filters can be
-                        found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found
-                        `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
+        :param  int     $filter: The type of filter to apply. A list of filters can be found in
+                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param  int     $flags: Flags to apply. A list of flags can be found in
+                        `Filter flags <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:        ``$_SERVER`` item value if found, null if not
         :rtype: array|bool|float|int|object|string|null
 
@@ -499,8 +499,8 @@ The methods provided by the parent classes that are available are:
 
     .. php:method:: getUserAgent([$filter = null])
 
-        :param  int $filter: The type of filter to apply. A list of filters can be
-                    found `here <https://www.php.net/manual/en/filter.filters.php>`__.
+        :param  int     $filter: The type of filter to apply. A list of filters can be found in
+                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
         :returns:  The User Agent string, as found in the SERVER data, or null if not found.
         :rtype: CodeIgniter\\HTTP\\UserAgent
 

From 99538c553c789d5b2415b18a7fdf2541927272c2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:45:38 +0900
Subject: [PATCH 090/380] docs: fix incorrect param

There is no param in getUserAgent().
---
 user_guide_src/source/incoming/incomingrequest.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index f2d8d02f8cf2..c3f5f7495073 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -497,10 +497,8 @@ The methods provided by the parent classes that are available are:
 
         .. literalinclude:: incomingrequest/037.php
 
-    .. php:method:: getUserAgent([$filter = null])
+    .. php:method:: getUserAgent()
 
-        :param  int     $filter: The type of filter to apply. A list of filters can be found in
-                        `Types of filters <https://www.php.net/manual/en/filter.filters.php>`__.
         :returns:  The User Agent string, as found in the SERVER data, or null if not found.
         :rtype: CodeIgniter\\HTTP\\UserAgent
 

From fb0af42345619fec3f2f76c3b1f0370b9a037f5f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 09:56:59 +0900
Subject: [PATCH 091/380] docs: add note to not recommended method

---
 user_guide_src/source/incoming/incomingrequest.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index c3f5f7495073..479e64e18278 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -151,6 +151,10 @@ getGetPost()
 getVar()
 --------
 
+.. important:: This method exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you use
+    another, more appropriate method.
+
 The ``getVar()`` method will pull from ``$_REQUEST``, so will return any data from ``$_GET``, ``$POST``, or ``$_COOKIE`` (depending on php.ini `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_).
 
 .. warning:: If you want to validate POST data only, don't use ``getVar()``.
@@ -362,6 +366,10 @@ The methods provided by the parent classes that are available are:
         :returns:   ``$_REQUEST`` if no parameters supplied, otherwise the REQUEST value if found, or null if not
         :rtype: array|bool|float|int|object|string|null
 
+        .. important:: This method exists only for backward compatibility. Do not use it
+            in new projects. Even if you are already using it, we recommend that you use
+            another, more appropriate method.
+
         This method is identical to ``getGet()``, only it fetches REQUEST data.
 
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])

From 9399b61bbb56a681c5afbd64412919f31789d382 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 10:05:20 +0900
Subject: [PATCH 092/380] docs: add note to not recommened methods

---
 user_guide_src/source/incoming/routing.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 0fa702ff10d2..7db0eaf36e0b 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -290,6 +290,10 @@ routes defined within this closure are only accessible from the given environmen
 Routes with any HTTP verbs
 ==========================
 
+.. important:: This method exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you use
+    another, more appropriate method.
+
 .. warning:: While the ``add()`` method seems to be convenient, it is recommended to always use the HTTP-verb-based
     routes, described above, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
     requests. If the URI specified in the ``add()`` method is accessible by the GET method, the CSRF protection
@@ -307,6 +311,10 @@ You can use the ``add()`` method:
 Mapping Multiple Routes
 =======================
 
+.. important:: This method exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you use
+    another, more appropriate method.
+
 .. warning:: The ``map()`` method is not recommended as well as ``add()``
     because it calls ``add()`` internally.
 

From 6b78a75c431fc3495b0ae030a3401c2790f944bf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 11:22:32 +0900
Subject: [PATCH 093/380] docs: use validateData() instead of validate()

validate() is not recommended.
---
 .../source/tutorial/create_news_items.rst           | 13 ++++++++++++-
 .../source/tutorial/create_news_items/005.php       |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 6443e674d450..6f2c5f997c6e 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -106,11 +106,22 @@ You're going to do three things here:
 
 The code above adds a lot of functionality.
 
+Retrieve the Data
+^^^^^^^^^^^^^^^^^
+
+First, we use the :doc:`IncomingRequest <../incoming/incomingrequest>`
+object ``$this->request``, which is set in the controller by the framework.
+
+We get the necessary items from the **POST** data by the user and set them in the
+``$data`` variable.
+
 Validate the Data
 ^^^^^^^^^^^^^^^^^
 
-You'll use the Controller-provided helper function :ref:`validate() <controller-validate>` to validate the submitted data.
+Next, you'll use the Controller-provided helper function
+:ref:`validateData() <controller-validatedata>` to validate the submitted data.
 In this case, the title and body fields are required and in the specific length.
+
 CodeIgniter has a powerful validation library as demonstrated
 above. You can read more about the :doc:`Validation library <../libraries/validation>`.
 
diff --git a/user_guide_src/source/tutorial/create_news_items/005.php b/user_guide_src/source/tutorial/create_news_items/005.php
index 6d565789141a..bf3a3e2b3bb0 100644
--- a/user_guide_src/source/tutorial/create_news_items/005.php
+++ b/user_guide_src/source/tutorial/create_news_items/005.php
@@ -13,8 +13,10 @@ public function create()
     {
         helper('form');
 
+        $data = $this->request->getPost(['title', 'body']);
+
         // Checks whether the submitted data passed the validation rules.
-        if (! $this->validate([
+        if (! $this->validateData($data, [
             'title' => 'required|max_length[255]|min_length[3]',
             'body'  => 'required|max_length[5000]|min_length[10]',
         ])) {

From 8ba7444083569c692efdfb5b1891f178be0c0fcb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Nov 2023 07:05:21 +0900
Subject: [PATCH 094/380] fix: add check if valid JSON

---
 system/HTTP/Exceptions/HTTPException.php  | 13 +++++++++++++
 system/HTTP/IncomingRequest.php           | 10 +++++++++-
 system/Language/en/HTTP.php               |  1 +
 tests/system/HTTP/IncomingRequestTest.php | 13 +++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index d22c48bcb9f3..32f9ceabd662 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -72,6 +72,19 @@ public static function forInvalidNegotiationType(string $type)
         return new static(lang('HTTP.invalidNegotiationType', [$type]));
     }
 
+    /**
+     * Thrown in IncomingRequest when the json_decode() produces
+     *  an error code other than JSON_ERROR_NONE.
+     *
+     * @param string $error The error message
+     *
+     * @return static
+     */
+    public static function forInvalidJSON(?string $error = null)
+    {
+        return new static(lang('HTTP.invalidJSON', [$error]));
+    }
+
     /**
      * For Message
      *
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 307a78d38b4a..f263ad166d77 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -573,10 +573,18 @@ public function getVar($index = null, $filter = null, $flags = null)
      * @see http://php.net/manual/en/function.json-decode.php
      *
      * @return array|bool|float|int|stdClass|null
+     *
+     * @throws HTTPException When the body is invalid as JSON.
      */
     public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
     {
-        return json_decode($this->body ?? '', $assoc, $depth, $options);
+        $result = json_decode($this->body ?? '', $assoc, $depth, $options);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            throw HTTPException::forInvalidJSON(json_last_error_msg());
+        }
+
+        return $result;
     }
 
     /**
diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php
index a7861c7188d1..e9082f85d185 100644
--- a/system/Language/en/HTTP.php
+++ b/system/Language/en/HTTP.php
@@ -19,6 +19,7 @@
 
     // IncomingRequest
     'invalidNegotiationType' => '"{0}" is not a valid negotiation type. Must be one of: media, charset, encoding, language.',
+    'invalidJSON'            => 'Failed to parse JSON string. Error: {0}',
 
     // Message
     'invalidHTTPProtocol' => 'Invalid HTTP Protocol Version: {0}',
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 9f6114f4875e..af7f650329d3 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -528,6 +528,19 @@ public function testGetJSONReturnsNullFromNullBody(): void
         $this->assertNull($request->getJSON());
     }
 
+    public function testGetJSONWithInvalidJSONString(): void
+    {
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage('Failed to parse JSON string. Error: Syntax error');
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+        $json            = 'Invalid JSON string';
+        $request         = $this->createRequest($config, $json);
+
+        $request->getJSON();
+    }
+
     public function testCanGrabGetRawInput(): void
     {
         $rawstring = 'username=admin001&role=administrator&usepass=0';

From 4d2a4ba47ca121a6cb90049104bb8075518c4ef7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Nov 2023 07:07:25 +0900
Subject: [PATCH 095/380] test: add test for Validation::withRequest()

---
 tests/system/Validation/ValidationTest.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 7cc6f99c40d5..b2db31ad00b0 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Validation;
 
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
@@ -789,6 +790,25 @@ public function testJsonInput(): void
         unset($_SERVER['CONTENT_TYPE']);
     }
 
+    public function testJsonInputInvalid(): void
+    {
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage('Failed to parse JSON string. Error: Syntax error');
+
+        $config  = new App();
+        $json    = 'invalid';
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+        $request->setHeader('Content-Type', 'application/json');
+
+        $rules = [
+            'role' => 'if_exist|max_length[5]',
+        ];
+        $this->validation
+            ->withRequest($request->withMethod('POST'))
+            ->setRules($rules)
+            ->run();
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/6466
      */

From a3a7134a4bf84e2ce8c537b86974ee0e3d833fa1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 11:39:42 +0900
Subject: [PATCH 096/380] fix: if body is null, should return null

See IncomingRequestTest::testGetJSONReturnsNullFromNullBody()
---
 system/HTTP/IncomingRequest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index f263ad166d77..48b9f3f61be4 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -578,7 +578,11 @@ public function getVar($index = null, $filter = null, $flags = null)
      */
     public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
     {
-        $result = json_decode($this->body ?? '', $assoc, $depth, $options);
+        if ($this->body === null) {
+            return null;
+        }
+
+        $result = json_decode($this->body, $assoc, $depth, $options);
 
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw HTTPException::forInvalidJSON(json_last_error_msg());

From bfcae8dcb3dbde1e76a32f640fa85fd72c922507 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 11:44:09 +0900
Subject: [PATCH 097/380] test: add test for getJSON() and JSON_THROW_ON_ERROR

---
 tests/system/HTTP/IncomingRequestTest.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index af7f650329d3..9c323b8e5639 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -18,6 +18,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 use InvalidArgumentException;
+use JsonException;
 use TypeError;
 
 /**
@@ -541,6 +542,19 @@ public function testGetJSONWithInvalidJSONString(): void
         $request->getJSON();
     }
 
+    public function testGetJSONWithJsonThrowOnErrorAndInvalidJSONString(): void
+    {
+        $this->expectException(JsonException::class);
+        $this->expectExceptionMessage('Syntax error');
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+        $json            = 'Invalid JSON string';
+        $request         = $this->createRequest($config, $json);
+
+        $request->getJSON(false, 512, JSON_THROW_ON_ERROR);
+    }
+
     public function testCanGrabGetRawInput(): void
     {
         $rawstring = 'username=admin001&role=administrator&usepass=0';

From d0bf4bc998774899bc982b4d3f9cf127e70aeb57 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 11:53:36 +0900
Subject: [PATCH 098/380] docs: add changelog

---
 user_guide_src/source/changelogs/v4.4.4.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index bb4250f1e63f..dfc862d62b62 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -31,6 +31,8 @@ and Traditional rules validate data of non-string types.
 Message Changes
 ***************
 
+- Added ``HTTP.invalidJSON`` error message.
+
 *******
 Changes
 *******

From eb908d14f9c5c0e342edd7428787dba0c4d982a5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 13:11:13 +0900
Subject: [PATCH 099/380] fix: Undefined array key error

---
 system/Commands/Database/ShowTableInfo.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index f955c6b27011..4c8f1bfd3865 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -125,7 +125,7 @@ public function run(array $params)
         $limitRows       = (int) ($params['limit-rows'] ?? 10);
         $limitFieldValue = (int) ($params['limit-field-value'] ?? 15);
 
-        if (! in_array($tableName, $tables, true)) {
+        while (! in_array($tableName, $tables, true)) {
             $tableNameNo = CLI::promptByKey(
                 ['Here is the list of your database tables:', 'Which table do you want to see?'],
                 $tables,
@@ -133,7 +133,7 @@ public function run(array $params)
             );
             CLI::newLine();
 
-            $tableName = $tables[$tableNameNo];
+            $tableName = $tables[$tableNameNo] ?? null;
         }
 
         if (array_key_exists('metadata', $params)) {

From 698dbf57f77493c350a9fb72b02e460e68abe0e7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 15:36:49 +0900
Subject: [PATCH 100/380] docs: add notes to not recommened withRequest()

---
 user_guide_src/source/libraries/validation.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 6fc55822b71a..0e172d575f84 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -343,6 +343,10 @@ For example, data returned by multi select dropdown:
 withRequest()
 =============
 
+.. important:: This method exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you use
+    another, more appropriate method.
+
 .. warning:: If you want to validate POST data only, don't use ``withRequest()``.
     This method uses :ref:`$request->getVar() <incomingrequest-getting-data>`
     which returns ``$_GET``, ``$_POST`` or ``$_COOKIE`` data in that order

From 75676bda3b73aab6511ded0be46089966e0993ef Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 20:59:29 +0900
Subject: [PATCH 101/380] docs: make it clear these rules accept only ASCII
 alphabets

---
 user_guide_src/source/libraries/validation.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 6fc55822b71a..c088198bfc9c 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -829,16 +829,16 @@ The following is a list of all the native rules that are available to use:
 Rule                    Parameter  Description                                   Example
 ======================= ========== ============================================= ===================================================
 alpha                   No         Fails if field has anything other than
-                                   alphabetic characters.
+                                   alphabetic characters in ASCII.
 alpha_space             No         Fails if field contains anything other than
-                                   alphabetic characters or spaces.
+                                   alphabetic characters or spaces in ASCII.
 alpha_dash              No         Fails if field contains anything other than
                                    alphanumeric characters, underscores or
-                                   dashes.
+                                   dashes in ASCII.
 alpha_numeric           No         Fails if field contains anything other than
-                                   alphanumeric characters.
+                                   alphanumeric characters in ASCII.
 alpha_numeric_space     No         Fails if field contains anything other than
-                                   alphanumeric or space characters.
+                                   alphanumeric or space characters in ASCII.
 alpha_numeric_punct     No         Fails if field contains anything other than
                                    alphanumeric, space, or this limited set of
                                    punctuation characters: ``~`` (tilde),

From b8871133e0482cebbe83d748f6d64c026d3256c7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 06:52:10 +0900
Subject: [PATCH 102/380] docs: fix description

Co-authored-by: Michal Sniatala <michal@sniatala.pl>
---
 user_guide_src/source/incoming/incomingrequest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 479e64e18278..c6db5b28fe4c 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -396,7 +396,7 @@ The methods provided by the parent classes that are available are:
 
         To return an array of all GET items call without any parameters.
 
-        To return all REQUEST items and pass them through the filter, set the
+        To return all GET items and pass them through the filter, set the
         first parameter to null while setting the second parameter to the filter
         you want to use:
 

From 757973c76acae3e71277434853a012561f80c5d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 07:36:21 +0900
Subject: [PATCH 103/380] docs: make note more accurate

---
 user_guide_src/source/incoming/filters.rst | 7 ++++---
 user_guide_src/source/incoming/routing.rst | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 29462ccc6538..cee8515dcd54 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -204,7 +204,7 @@ filter:check
 
 .. versionadded:: 4.3.0
 
-Check the filters for the route ``/`` with **GET** method:
+For example, check the filters for the route ``/`` with **GET** method:
 
 .. code-block:: console
 
@@ -220,8 +220,9 @@ The output is like the following:
     | GET    | /     |                | toolbar       |
     +--------+-------+----------------+---------------+
 
-You can also see the routes and filters by the ``spark routes`` command.
-See :ref:`URI Routing <routing-spark-routes>`.
+You can also see the routes and filters by the ``spark routes`` command,
+but it might not show accurate filters when you use regular expressions for routes.
+See :ref:`URI Routing <routing-spark-routes>` for details.
 
 ****************
 Provided Filters
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 0fa702ff10d2..8cb3e37718b8 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -907,7 +907,13 @@ The *Route* column shows the route path to match. The route of a defined route i
 
 Since v4.3.0, the *Name* column shows the route name. ``»`` indicates the name is the same as the route path.
 
-.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. If you want to check filters for a route, you can use :ref:`spark filter:check <spark-filter-check>` command.
+.. important:: The system is not perfect.
+    For routes containing regular expression patterns like ``([^/]+)`` or ``{locale}``,
+    the *Filters* displayed might not be correct (if you set complicated URI pattern
+    for the filters in **app/Config/Filters.php**), or it is displayed as ``<unknown>``.
+
+    The :ref:`spark filter:check <spark-filter-check>` command can be used to check
+    for 100% accurate filters.
 
 Auto Routing (Improved)
 -----------------------

From e063cbe1be98f6a1830a2a4b889d55e8a3b1d575 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 10:55:32 +0900
Subject: [PATCH 104/380] docs: add about difference in redirec()

---
 user_guide_src/source/installation/upgrade_4xx.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index bf7ba85fece6..9e8ac1dbe7aa 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -142,7 +142,12 @@ Helpers
 - In CI4, ``redirect()`` is completely changed from CI3's.
     - `redirect() Documentation CodeIgniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
     - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_
-    - In CI4, ``redirect()`` returns a ``RedirectResponse`` instance instead of redirecting and terminating script execution. You must return it.
+    - In CI4, :php:func:`redirect()` returns a ``RedirectResponse`` instance instead of
+      redirecting and terminating script execution. You must return it from Controllers
+      or Controller Filters.
+    - Cookies and Headers you set before calling ``redirect()`` are not automatically
+      carried over to a ``RedirectResponse``. You need to call ``withCookies()``
+      or ``withHeaders()`` manually if you want to send them.
     - You need to change CI3's ``redirect('login/form')`` to ``return redirect()->to('login/form')``.
 
 Hooks

From 6ead627af963c0c5e076d515e6f00d8d5332c44d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 10:56:30 +0900
Subject: [PATCH 105/380] docs: add notes and descriptions for setting cookies

---
 user_guide_src/source/helpers/cookie_helper.rst | 12 +++++++++++-
 user_guide_src/source/outgoing/response.rst     |  6 +++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 10002e2a9eb5..813025adb185 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -42,6 +42,11 @@ The following functions are available:
     a description of its use, as this function is an alias for
     :php:meth:`CodeIgniter\\HTTP\\Response::setCookie()`.
 
+    .. note:: This helper function just sets browser cookies to the global response
+        instance that ``Services::response()`` returns. So, if you create and
+        return another response instance (e.g., if you call :php:func:`redirect()`),
+        the cookies set here will not be sent automatically.
+
 .. php:function:: get_cookie($index[, $xssClean = false[, $prefix = '']])
 
     :param    string    $index: Cookie name
@@ -78,6 +83,9 @@ The following functions are available:
     This function is otherwise identical to :php:func:`set_cookie()`, except that it
     does not have the ``value`` and ``expire`` parameters.
 
+    This also just sets browser cookies for deleting the cookies to the global
+    response instance that ``Services::response()`` returns.
+
     .. note:: When you use :php:func:`set_cookie()`,
         if the ``value`` is set to empty string and the ``expire`` is set to ``0``, the cookie will be deleted.
         If the ``value`` is set to non-empty string and the ``expire`` is set to ``0``, the cookie will only last as long as the browser is open.
@@ -95,4 +103,6 @@ The following functions are available:
     :param string $prefix: Cookie prefix
     :rtype: bool
 
-    Checks if a cookie exists by name. This is an alias of ``Response::hasCookie()``.
+    Checks if a cookie exists by name in the global response instance that
+    ``Services::response()`` returns. This is an alias of
+    :php:meth:`CodeIgniter\\HTTP\\Response::hasCookie()`.
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 539c99180eaa..7dca22dda53a 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -384,7 +384,9 @@ The methods provided by the parent class that are available are:
         .. note:: Prior to v4.2.7, the default values of ``$secure`` and ``$httponly`` were ``false``
             due to a bug, and these values from **app/Config/Cookie.php** were never used.
 
-        Sets a cookie containing the values you specify. There are two ways to
+        Sets a cookie containing the values you specify to the Response instance.
+
+        There are two ways to
         pass information to this method so that a cookie can be set: Array
         Method, and Discrete Parameters:
 
@@ -439,6 +441,8 @@ The methods provided by the parent class that are available are:
 
         Delete an existing cookie.
 
+        .. note:: This also just sets browser cookie for deleting the cookie.
+
         Only the ``name`` is required.
 
         The ``prefix`` is only needed if you need to avoid name collisions with

From cc15903bc2a80ca128e93a8578c3e84097189f31 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 10:58:22 +0900
Subject: [PATCH 106/380] docs: add explanation for "global response instance"

---
 user_guide_src/source/outgoing/response.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 7dca22dda53a..ad37311fb6e8 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -12,8 +12,11 @@ a server responding to the client that called it.
 Working with the Response
 =========================
 
-A Response class is instantiated for you and passed into your controllers. It can be accessed through
-``$this->response``. Many times you will not need to touch the class directly, since CodeIgniter takes care of
+A Response class is instantiated for you and passed into your controllers. It can
+be accessed through ``$this->response``. It is the same instance that
+``Services::response()`` returns. We call it the global response instance.
+
+Many times you will not need to touch the class directly, since CodeIgniter takes care of
 sending the headers and the body for you. This is great if the page successfully created the content it was asked to.
 When things go wrong, or you need to send very specific status codes back, or even take advantage of the
 powerful HTTP caching, it's there for you.

From d7cbe6f04b05ba48e300bb2bd12abe4ca25e1913 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 10:58:54 +0900
Subject: [PATCH 107/380] docs: make it more readable

---
 user_guide_src/source/outgoing/response.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index ad37311fb6e8..4cf1c196edbb 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -44,13 +44,16 @@ Setting Headers
 ---------------
 
 Often, you will need to set headers to be set for the response. The Response class makes this very simple to do,
-with the ``setHeader()`` method. The first parameter is the name of the header. The second parameter is the value,
+with the ``setHeader()`` method.
+
+The first parameter is the name of the header. The second parameter is the value,
 which can be either a string or an array of values that will be combined correctly when sent to the client.
-Using these functions instead of using the native PHP functions allows you to ensure that no headers are sent
-prematurely, causing errors, and makes testing possible.
 
 .. literalinclude:: response/004.php
 
+Using these functions instead of using the native PHP functions allows you to ensure that no headers are sent
+prematurely, causing errors, and makes testing possible.
+
 If the header exists and can have more than one value, you may use the ``appendHeader()`` and ``prependHeader()``
 methods to add the value to the end or beginning of the values list, respectively. The first parameter is the name
 of the header, while the second is the value to append or prepend.

From 8778a7c2fcae7a3f17ed089df84e92023d51e051 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 11:01:09 +0900
Subject: [PATCH 108/380] docs: add sub section titles

---
 user_guide_src/source/outgoing/response.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 4cf1c196edbb..3d7b81c6970d 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -43,6 +43,9 @@ You can set format an array into either JSON or XML and set the content type hea
 Setting Headers
 ---------------
 
+setHeader()
+^^^^^^^^^^^
+
 Often, you will need to set headers to be set for the response. The Response class makes this very simple to do,
 with the ``setHeader()`` method.
 
@@ -54,12 +57,18 @@ which can be either a string or an array of values that will be combined correct
 Using these functions instead of using the native PHP functions allows you to ensure that no headers are sent
 prematurely, causing errors, and makes testing possible.
 
+appendHeader()
+^^^^^^^^^^^^^^
+
 If the header exists and can have more than one value, you may use the ``appendHeader()`` and ``prependHeader()``
 methods to add the value to the end or beginning of the values list, respectively. The first parameter is the name
 of the header, while the second is the value to append or prepend.
 
 .. literalinclude:: response/005.php
 
+removeHeader()
+^^^^^^^^^^^^^^
+
 Headers can be removed from the response with the ``removeHeader()`` method, which takes the header name as the only
 parameter. This is not case-sensitive.
 

From b0ac56d2baf4c5fb60b2d612b6ea7c954375096b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 11:03:42 +0900
Subject: [PATCH 109/380] docs: add note to setting headers

---
 user_guide_src/source/outgoing/response.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 3d7b81c6970d..ee115350763f 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -57,6 +57,10 @@ which can be either a string or an array of values that will be combined correct
 Using these functions instead of using the native PHP functions allows you to ensure that no headers are sent
 prematurely, causing errors, and makes testing possible.
 
+.. note:: This method just sets headers to the response instance. So, if you create
+    and return another response instance (e.g., if you call :php:func:`redirect()`),
+    the headers set here will not be sent automatically.
+
 appendHeader()
 ^^^^^^^^^^^^^^
 

From dcc6467b55672dd39d67edd1627976567b323003 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 11:29:59 +0900
Subject: [PATCH 110/380] chore: workaround for UndefinedClass

UndefinedClass: Class, interface or enum named SimpleConfig does not exist (see https://psalm.dev/019)
---
 psalm_autoload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/psalm_autoload.php b/psalm_autoload.php
index d0f0c9af46e6..d42636a11fef 100644
--- a/psalm_autoload.php
+++ b/psalm_autoload.php
@@ -25,6 +25,7 @@
 
 $dirs = [
     'tests/_support/Controllers',
+    'tests/system/Config/fixtures',
 ];
 
 foreach ($dirs as $dir) {

From 1cf6cb8a418b19c657e5af9906305b3a21fa6c7e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 17:39:32 +0900
Subject: [PATCH 111/380] docs: fix @var for $validator

---
 system/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Controller.php b/system/Controller.php
index 45fe0e499565..c040e1d20a4f 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -65,7 +65,7 @@ class Controller
     /**
      * Once validation has been run, will hold the Validation instance.
      *
-     * @var ValidationInterface
+     * @var ValidationInterface|null
      */
     protected $validator;
 

From 98ed457543360c2c36c633dd7b88c1e9dd67cc46 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 07:39:06 +0900
Subject: [PATCH 112/380] docs: add warning to validate()

---
 .../source/incoming/controllers.rst           | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 8bc9e90d581f..e4fa3caafc60 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -87,15 +87,44 @@ modify this by passing the duration (in seconds) as the first parameter:
 Validating Data
 ***************
 
+.. _controller-validatedata:
+
+$this->validateData()
+=====================
+
+.. versionadded:: 4.2.0
+
+To simplify data checking, the controller also provides the convenience method
+``validateData()``.
+
+The method accepts an array of data to validate in the first parameter, and an
+array of rules in the second parameter, and in the optional third parameter,
+an array of custom error messages to display if the items are not valid.
+
+The :doc:`Validation Library docs </libraries/validation>` have details on
+rule and message array formats, as well as available rules:
+
+.. literalinclude:: controllers/006.php
+
 .. _controller-validate:
 
 $this->validate()
 =================
 
-To simplify data checking, the controller also provides the convenience method ``validate()``.
+The controller also provides the convenience method ``validate()``.
+
+.. warning:: Instead of ``validate()``, use ``validateData()`` to validate POST
+    data only. ``validate()`` uses ``$request->getVar()`` which returns
+    ``$_GET``, ``$_POST`` or ``$_COOKIE`` data in that order (depending on php.ini
+    `request-order <https://www.php.net/manual/en/ini.core.php#ini.request-order>`_).
+    Newer values override older values. POST values may be overridden by the
+    cookies if they have the same name.
+
 The method accepts an array of rules in the first parameter,
 and in the optional second parameter, an array of custom error messages to display
-if the items are not valid. Internally, this uses the controller's
+if the items are not valid.
+
+Internally, this uses the controller's
 ``$this->request`` instance to get the data to be validated.
 
 The :doc:`Validation Library docs </libraries/validation>` have details on
@@ -123,19 +152,6 @@ the ``$rules`` array with the name of the group as defined in **app/Config/Valid
 
 .. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
 
-.. _controller-validatedata:
-
-$this->validateData()
-=====================
-
-.. versionadded:: 4.2.0
-
-Sometimes you may want to check the controller method parameters or other custom data.
-In that case, you can use the ``$this->validateData()`` method.
-The method accepts an array of data to validate in the first parameter:
-
-.. literalinclude:: controllers/006.php
-
 Protecting Methods
 ******************
 

From 37472711c788a3728aff6a6c475f777f91b6e72a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 07:41:54 +0900
Subject: [PATCH 113/380] docs: replace getVar() with getPost()

getVar() is not recommended.
---
 user_guide_src/source/incoming/controllers/006.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/controllers/006.php b/user_guide_src/source/incoming/controllers/006.php
index 555a8c98d570..8bf7045411f1 100644
--- a/user_guide_src/source/incoming/controllers/006.php
+++ b/user_guide_src/source/incoming/controllers/006.php
@@ -8,7 +8,7 @@ public function product(int $id)
     {
         $data = [
             'id'   => $id,
-            'name' => $this->request->getVar('name'),
+            'name' => $this->request->getPost('name'),
         ];
 
         $rule = [

From 71c18481c53a26a907f12a8f91d2c2e63c58ce7f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Nov 2023 11:29:37 +0900
Subject: [PATCH 114/380] docs: add note to not recommened validate()

---
 user_guide_src/source/incoming/controllers.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index e4fa3caafc60..a901c9fd58eb 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -111,6 +111,10 @@ rule and message array formats, as well as available rules:
 $this->validate()
 =================
 
+.. important:: This method exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you use
+    the ``validateData()`` method instead.
+
 The controller also provides the convenience method ``validate()``.
 
 .. warning:: Instead of ``validate()``, use ``validateData()`` to validate POST

From 04505c74ffe0c49fc45f756473c8780e03953ebe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Nov 2023 06:29:03 +0900
Subject: [PATCH 115/380] docs: add about missing fourth parameter

---
 user_guide_src/source/incoming/controllers.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index a901c9fd58eb..bf5a747cb462 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -97,9 +97,9 @@ $this->validateData()
 To simplify data checking, the controller also provides the convenience method
 ``validateData()``.
 
-The method accepts an array of data to validate in the first parameter, and an
-array of rules in the second parameter, and in the optional third parameter,
-an array of custom error messages to display if the items are not valid.
+The method accepts (1) an array of data to validate, (2) an array of rules,
+(3) an optional array of custom error messages to display if the items are not valid,
+(4) an optional database group to use.
 
 The :doc:`Validation Library docs </libraries/validation>` have details on
 rule and message array formats, as well as available rules:

From f9da010d0ad73edd50d327e8de83ad69b688cf4c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Nov 2023 08:35:42 +0900
Subject: [PATCH 116/380] docs: add note to not recommended Auto Routing
 (Legacy)

---
 user_guide_src/source/incoming/controllers.rst | 4 ++++
 user_guide_src/source/incoming/routing.rst     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index bf5a747cb462..113e9a50d5df 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -422,6 +422,10 @@ CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Rout
 Auto Routing (Legacy)
 *********************
 
+.. important:: This feature exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you use
+    the :ref:`auto-routing-improved` instead.
+
 This section describes the functionality of Auto Routing (Legacy) that is a routing system from CodeIgniter 3.
 It automatically routes an HTTP request, and executes the corresponding controller method
 without route definitions. The auto-routing is disabled by default.
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 7db0eaf36e0b..ce753e929c0d 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -801,6 +801,10 @@ will be routed to ``Acme\Blog\Controllers\Foo::getBar()``.
 Auto Routing (Legacy)
 *********************
 
+.. important:: This feature exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you use
+    the :ref:`auto-routing-improved` instead.
+
 Auto Routing (Legacy) is a routing system from CodeIgniter 3.
 It can automatically route HTTP requests based on conventions and execute the corresponding controller methods.
 

From b2d99264472e8052331a2e26775d6c6bfbbbb6da Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Nov 2023 08:39:40 +0900
Subject: [PATCH 117/380] docs: add note to not recommended $shareOptions

---
 user_guide_src/source/libraries/curlrequest.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index f029efc4f883..ebfd1934c88f 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -28,9 +28,11 @@ Config for CURLRequest
 Sharing Options
 ===============
 
-.. note:: Since v4.4.0, the default value has been changed to ``false``. This
-    setting exists only for backward compatibility. New users do not need to
-    change the setting.
+.. important:: This setting exists only for backward compatibility. Do not use it
+    in new projects. Even if you are already using it, we recommend that you disable
+    it.
+
+.. note:: Since v4.4.0, the default value has been changed to ``false``.
 
 If you want to share all the options between requests, set ``$shareOptions`` to
 ``true`` in **app/Config/CURLRequest.php**:

From a555953360fb6a545a28a58e3aef34de40c87399 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Nov 2023 08:42:45 +0900
Subject: [PATCH 118/380] docs: add note to not recommended Traditional Rules

---
 user_guide_src/source/libraries/validation.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index a3dcfa52a817..42782751653c 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -221,6 +221,10 @@ and the new classes (**Strict Rules**) have ``CodeIgniter\Validation\StrictRules
 Traditional Rules
 -----------------
 
+.. important:: Traditional Rules exist only for backward compatibility. Do not
+    use them in new projects. Even if you are already using, we recommend that
+    you switch to Strict Rules.
+
 .. warning:: When validating data that contains non-string values, such as JSON data, it is recommended to use **Strict Rules**.
 
 The **Traditional Rules** implicitly assume that string values are validated,

From 0d518babe9f20820fc67583f3c1d3b1567a21533 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Nov 2023 05:32:42 +0900
Subject: [PATCH 119/380] docs: add missing core classes

---
 .../source/extending/core_classes.rst         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index efb42c53034e..a1731e7e460a 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -22,26 +22,41 @@ System Class List
 The following is a list of the core system classes that are invoked every time CodeIgniter runs:
 
 *  ``CodeIgniter\Autoloader\Autoloader``
+*  ``CodeIgniter\Autoloader\FileLocator``
+*  ``CodeIgniter\Cache\CacheFactory``
+*  ``CodeIgniter\Cache\Handlers\BaseHandler``
+*  ``CodeIgniter\Cache\Handlers\FileHandler``
+*  ``CodeIgniter\Cache\ResponseCache``
 *  ``CodeIgniter\CodeIgniter``
+*  ``CodeIgniter\Config\BaseService``
 *  ``CodeIgniter\Config\DotEnv``
+*  ``CodeIgniter\Config\Factories``
 *  ``CodeIgniter\Config\Services``
 *  ``CodeIgniter\Controller``
+*  ``CodeIgniter\Cookie\Cookie``
+*  ``CodeIgniter\Cookie\CookieStore``
 *  ``CodeIgniter\Debug\Exceptions``
 *  ``CodeIgniter\Debug\Timer``
 *  ``CodeIgniter\Events\Events``
 *  ``CodeIgniter\Filters\Filters``
-*  ``CodeIgniter\HTTP\ContentSecurityPolicy``
 *  ``CodeIgniter\HTTP\CLIRequest`` (if launched from command line only)
+*  ``CodeIgniter\HTTP\ContentSecurityPolicy``
+*  ``CodeIgniter\HTTP\Header``
 *  ``CodeIgniter\HTTP\IncomingRequest`` (if launched over HTTP)
+*  ``CodeIgniter\HTTP\Message``
+*  ``CodeIgniter\HTTP\OutgoingRequest``
 *  ``CodeIgniter\HTTP\Request``
 *  ``CodeIgniter\HTTP\Response``
-*  ``CodeIgniter\HTTP\Message``
+*  ``CodeIgniter\HTTP\SiteURI``
+*  ``CodeIgniter\HTTP\SiteURIFactory``
 *  ``CodeIgniter\HTTP\URI``
+*  ``CodeIgniter\HTTP\UserAgent`` (if launched over HTTP)
 *  ``CodeIgniter\Log\Logger``
 *  ``CodeIgniter\Log\Handlers\BaseHandler``
 *  ``CodeIgniter\Log\Handlers\FileHandler``
 *  ``CodeIgniter\Router\RouteCollection``
 *  ``CodeIgniter\Router\Router``
+*  ``CodeIgniter\Superglobals``
 *  ``CodeIgniter\View\View``
 
 Replacing Core Classes

From d07c73cca4b85bd25f3c49d047d77865ba053153 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Nov 2023 07:54:56 +0900
Subject: [PATCH 120/380] docs: fix by proofreading

Co-authored-by: Michal Sniatala <michal@sniatala.pl>
---
 user_guide_src/source/libraries/validation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 42782751653c..df48ce2ed55b 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -222,8 +222,8 @@ Traditional Rules
 -----------------
 
 .. important:: Traditional Rules exist only for backward compatibility. Do not
-    use them in new projects. Even if you are already using, we recommend that
-    you switch to Strict Rules.
+    use them in new projects. Even if you are already using them, we recommend 
+    switching to Strict Rules.
 
 .. warning:: When validating data that contains non-string values, such as JSON data, it is recommended to use **Strict Rules**.
 

From 1a25f1bfd80e47a29da995cfeed2f9ec05be410a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 09:16:28 +0900
Subject: [PATCH 121/380] refactor: replace non bool if conditions

---
 phpstan-baseline.php |  7 +------
 system/BaseModel.php | 14 +++++++-------
 system/Model.php     |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 3cbe5a4732fc..beb2d85a4d84 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -56,11 +56,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/BaseModel.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#',
-	'count' => 7,
-	'path' => __DIR__ . '/system/BaseModel.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, array\\|null given\\.$#',
 	'count' => 1,
@@ -2628,7 +2623,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#',
-	'count' => 3,
+	'count' => 2,
 	'path' => __DIR__ . '/system/Model.php',
 ];
 $ignoreErrors[] = [
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 80baaf3fb024..e8e746e64c25 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -770,11 +770,11 @@ public function insert($data = null, bool $returnID = true)
         // Set created_at and updated_at with same time
         $date = $this->setDate();
 
-        if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $data)) {
+        if ($this->useTimestamps && $this->createdField !== '' && ! array_key_exists($this->createdField, $data)) {
             $data[$this->createdField] = $date;
         }
 
-        if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data)) {
+        if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $data)) {
             $data[$this->updatedField] = $date;
         }
 
@@ -857,11 +857,11 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
                 // Set created_at and updated_at with same time
                 $date = $this->setDate();
 
-                if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $row)) {
+                if ($this->useTimestamps && $this->createdField !== '' && ! array_key_exists($this->createdField, $row)) {
                     $row[$this->createdField] = $date;
                 }
 
-                if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row)) {
+                if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $row)) {
                     $row[$this->updatedField] = $date;
                 }
             }
@@ -929,7 +929,7 @@ public function update($id = null, $data = null): bool
             throw DataException::forEmptyDataset('update');
         }
 
-        if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data)) {
+        if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $data)) {
             $data[$this->updatedField] = $this->setDate();
         }
 
@@ -1014,7 +1014,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
                     $row[$index] = $updateIndex;
                 }
 
-                if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row)) {
+                if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $row)) {
                     $row[$this->updatedField] = $this->setDate();
                 }
             }
@@ -1147,7 +1147,7 @@ public function replace(?array $data = null, bool $returnSQL = false)
             return false;
         }
 
-        if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, (array) $data)) {
+        if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, (array) $data)) {
             $data[$this->updatedField] = $this->setDate();
         }
 
diff --git a/system/Model.php b/system/Model.php
index e53c0aae4bd1..1873804a3c2d 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -435,7 +435,7 @@ protected function doDelete($id = null, bool $purge = false)
 
             $set[$this->deletedField] = $this->setDate();
 
-            if ($this->useTimestamps && $this->updatedField) {
+            if ($this->useTimestamps && $this->updatedField !== '') {
                 $set[$this->updatedField] = $this->setDate();
             }
 

From 698a30569d65d5ac03356828e945ca4c060e60c4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 09:17:17 +0900
Subject: [PATCH 122/380] docs: clarify what "empty" is

---
 user_guide_src/source/models/model.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index db4ecd80b59d..43fdbb9d6f18 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -180,13 +180,13 @@ $createdField
 ^^^^^^^^^^^^^
 
 Specifies which database field to use for data record create timestamp.
-Leave it empty to avoid updating it (even if ``$useTimestamps`` is enabled).
+Leave it empty (``''``) to avoid updating it (even if ``$useTimestamps`` is enabled).
 
 $updatedField
 ^^^^^^^^^^^^^
 
 Specifies which database field should use for keep data record update timestamp.
-Leave it empty to avoid update it (even ``$useTimestamps`` is enabled).
+Leave it empty (``''``) to avoid update it (even ``$useTimestamps`` is enabled).
 
 $deletedField
 ^^^^^^^^^^^^^

From 72e769562557207ccdcf69f746d1d39869608981 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 09:20:16 +0900
Subject: [PATCH 123/380] docs: fix typo

---
 user_guide_src/source/models/model.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 43fdbb9d6f18..6a2700520fd0 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -186,7 +186,7 @@ $updatedField
 ^^^^^^^^^^^^^
 
 Specifies which database field should use for keep data record update timestamp.
-Leave it empty (``''``) to avoid update it (even ``$useTimestamps`` is enabled).
+Leave it empty (``''``) to avoid updating it (even ``$useTimestamps`` is enabled).
 
 $deletedField
 ^^^^^^^^^^^^^

From 064b8b0060f1b062c83f9a052337120fc2fecd51 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 17:32:34 +0900
Subject: [PATCH 124/380] test: add test for classname filter

---
 tests/system/Test/FilterTestTraitTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index bebec3857030..c05ea29ed340 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -73,6 +73,14 @@ public function testCallerSupportArray(): void
         $this->assertSame('http://hellowworld.com', $result->getBody());
     }
 
+    public function testCallerSupportClassname(): void
+    {
+        $caller = $this->getFilterCaller(Customfilter::class, 'before');
+        $result = $caller();
+
+        $this->assertSame('http://hellowworld.com', $result->getBody());
+    }
+
     public function testCallerUsesClonedInstance(): void
     {
         $caller = $this->getFilterCaller('test-customfilter', 'before');

From 0dc64cd66b8aa1a5c9c8e8833e9cea3c6571549d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 17:33:01 +0900
Subject: [PATCH 125/380] fix: ErrorException : Undefined variable
 $filterClasses

---
 system/Test/FilterTestTrait.php | 37 +++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 084a6cd082fc..523717e54679 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -125,6 +125,10 @@ protected function getFilterCaller($filter, string $position): Closure
             throw new InvalidArgumentException('Invalid filter position passed: ' . $position);
         }
 
+        if ($filter instanceof FilterInterface) {
+            $filterInstances = [$filter];
+        }
+
         if (is_string($filter)) {
             // Check for an alias (no namespace)
             if (strpos($filter, '\\') === false) {
@@ -132,28 +136,31 @@ protected function getFilterCaller($filter, string $position): Closure
                     throw new RuntimeException("No filter found with alias '{$filter}'");
                 }
 
-                $filterClasses = $this->filtersConfig->aliases[$filter];
+                $filterClasses = (array) $this->filtersConfig->aliases[$filter];
+            } else {
+                // FQCN
+                $filterClasses = [$filter];
             }
 
-            $filterClasses = (array) $filterClasses;
-        }
+            $filterInstances = [];
 
-        foreach ($filterClasses as $class) {
-            // Get an instance
-            $filter = new $class();
+            foreach ($filterClasses as $class) {
+                // Get an instance
+                $filter = new $class();
 
-            if (! $filter instanceof FilterInterface) {
-                throw FilterException::forIncorrectInterface(get_class($filter));
+                if (! $filter instanceof FilterInterface) {
+                    throw FilterException::forIncorrectInterface(get_class($filter));
+                }
+
+                $filterInstances[] = $filter;
             }
         }
 
         $request = clone $this->request;
 
         if ($position === 'before') {
-            return static function (?array $params = null) use ($filterClasses, $request) {
-                foreach ($filterClasses as $class) {
-                    $filter = new $class();
-
+            return static function (?array $params = null) use ($filterInstances, $request) {
+                foreach ($filterInstances as $filter) {
                     $result = $filter->before($request, $params);
 
                     // @TODO The following logic is in Filters class.
@@ -177,10 +184,8 @@ protected function getFilterCaller($filter, string $position): Closure
 
         $response = clone $this->response;
 
-        return static function (?array $params = null) use ($filterClasses, $request, $response) {
-            foreach ($filterClasses as $class) {
-                $filter = new $class();
-
+        return static function (?array $params = null) use ($filterInstances, $request, $response) {
+            foreach ($filterInstances as $filter) {
                 $result = $filter->after($request, $response, $params);
 
                 // @TODO The following logic is in Filters class.

From 7dc70874518006c7946c19aaa46fc8e1a351dd84 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 18:55:42 +0900
Subject: [PATCH 126/380] test: add test for Filter instance

---
 tests/system/Test/FilterTestTraitTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index c05ea29ed340..300bc2b47425 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -81,6 +81,14 @@ public function testCallerSupportClassname(): void
         $this->assertSame('http://hellowworld.com', $result->getBody());
     }
 
+    public function testCallerSupportsFilterInstance(): void
+    {
+        $caller = $this->getFilterCaller(new Customfilter(), 'before');
+        $result = $caller();
+
+        $this->assertSame('http://hellowworld.com', $result->getBody());
+    }
+
     public function testCallerUsesClonedInstance(): void
     {
         $caller = $this->getFilterCaller('test-customfilter', 'before');

From e7bd962eaa59f9431e286f72b487b24394d08aa1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 18:56:36 +0900
Subject: [PATCH 127/380] test: fix test method names

---
 tests/system/Test/FilterTestTraitTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index 300bc2b47425..dda0ca0d3265 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -63,7 +63,7 @@ public function testGetCallerInvalidPosition(): void
         $this->getFilterCaller('test-customfilter', 'banana');
     }
 
-    public function testCallerSupportArray(): void
+    public function testCallerSupportsArray(): void
     {
         $this->filtersConfig->aliases['test-customfilter'] = [Customfilter::class];
 
@@ -73,7 +73,7 @@ public function testCallerSupportArray(): void
         $this->assertSame('http://hellowworld.com', $result->getBody());
     }
 
-    public function testCallerSupportClassname(): void
+    public function testCallerSupportsClassname(): void
     {
         $caller = $this->getFilterCaller(Customfilter::class, 'before');
         $result = $caller();

From 396dca92c0c8e9f16c35665e5f4d58761905a3f3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 10:47:36 +0900
Subject: [PATCH 128/380] test: update tests to use SiteURI

---
 tests/system/API/ResponseTraitTest.php        | 15 +--
 tests/system/Cache/ResponseCacheTest.php      |  4 +-
 tests/system/CommonFunctionsTest.php          |  8 +-
 tests/system/ControllerTest.php               |  4 +-
 tests/system/Filters/InvalidCharsTest.php     |  4 +-
 .../HTTP/IncomingRequestDetectingTest.php     |  3 +-
 tests/system/HTTP/IncomingRequestTest.php     |  7 +-
 tests/system/Helpers/CookieHelperTest.php     |  4 +-
 tests/system/Pager/PagerTest.php              |  7 +-
 .../system/RESTful/ResourceControllerTest.php |  6 +-
 .../SecurityCSRFCookieRandomizeTokenTest.php  |  5 +-
 .../SecurityCSRFSessionRandomizeTokenTest.php | 51 +++++------
 .../Security/SecurityCSRFSessionTest.php      | 43 ++++-----
 tests/system/Security/SecurityTest.php        | 91 +++++--------------
 tests/system/Validation/ValidationTest.php    | 16 ++--
 15 files changed, 110 insertions(+), 158 deletions(-)

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index c867f1b4a94e..708235e9fbd9 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -15,7 +15,7 @@
 use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\Format\JSONFormatter;
 use CodeIgniter\Format\XMLFormatter;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockIncomingRequest;
@@ -42,7 +42,7 @@ protected function setUp(): void
         $this->formatter = new JSONFormatter();
     }
 
-    protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
+    protected function makeController(array $userConfig = [], string $routePath = '', array $userHeaders = [])
     {
         $config = new App();
 
@@ -73,7 +73,7 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
         Factories::injectMock('config', 'Cookie', $cookie);
 
         if ($this->request === null) {
-            $this->request  = new MockIncomingRequest($config, new URI($uri), null, new UserAgent());
+            $this->request  = new MockIncomingRequest($config, new SiteURI($config, $routePath), null, new UserAgent());
             $this->response = new MockResponse($config);
         }
 
@@ -115,7 +115,7 @@ public function resetFormatter(): void
     public function testNoFormatterJSON(): void
     {
         $this->formatter = null;
-        $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
+        $controller      = $this->makeController([], '', ['Accept' => 'application/json']);
 
         $this->invoke($controller, 'respondCreated', [['id' => 3], 'A Custom Reason']);
 
@@ -133,7 +133,7 @@ public function testNoFormatterJSON(): void
     public function testNoFormatter(): void
     {
         $this->formatter = null;
-        $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
+        $controller      = $this->makeController([], '', ['Accept' => 'application/json']);
 
         $this->invoke($controller, 'respondCreated', ['A Custom Reason']);
 
@@ -484,8 +484,9 @@ private function tryValidContentType($mimeType, $contentType): void
         $original                = $_SERVER;
         $_SERVER['CONTENT_TYPE'] = $mimeType;
 
-        $this->makeController([], 'http://codeigniter.com', ['Accept' => $mimeType]);
+        $this->makeController([], '', ['Accept' => $mimeType]);
         $this->assertSame($mimeType, $this->request->getHeaderLine('Accept'), 'Request header...');
+
         $this->response->setContentType($contentType);
         $this->assertSame($contentType, $this->response->getHeaderLine('Content-Type'), 'Response header pre-response...');
 
@@ -554,7 +555,7 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML(): void
         }
         Factories::injectMock('config', 'Cookie', $cookie);
 
-        $request  = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
+        $request  = new MockIncomingRequest($config, new SiteURI($config), null, new UserAgent());
         $response = new MockResponse($config);
 
         $controller = new class ($request, $response) {
diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php
index 12eaeb1a2d23..b34cfce95c37 100644
--- a/tests/system/Cache/ResponseCacheTest.php
+++ b/tests/system/Cache/ResponseCacheTest.php
@@ -15,7 +15,7 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App as AppConfig;
@@ -53,7 +53,7 @@ private function createIncomingRequest(
 
         $appConfig ??= $this->appConfig;
 
-        $siteUri = new URI($appConfig->baseURL . $uri);
+        $siteUri = new SiteURI($appConfig, $uri);
         if ($query !== []) {
             $_GET = $_REQUEST = $query;
             $siteUri->setQueryArray($query);
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index b6702c5a7376..228a24e9a26f 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -18,7 +18,7 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Session\Handlers\FileHandler;
@@ -411,7 +411,7 @@ public function testOldInput(): void
         $this->routes = $this->createRouteCollection();
         Services::injectMock('routes', $this->routes);
 
-        $this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
+        $this->request = new MockIncomingRequest($this->config, new SiteURI($this->config), null, new UserAgent());
         Services::injectMock('request', $this->request);
 
         // setup & ask for a redirect...
@@ -446,7 +446,7 @@ public function testOldInputSerializeData(): void
         $this->routes = $this->createRouteCollection();
         Services::injectMock('routes', $this->routes);
 
-        $this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
+        $this->request = new MockIncomingRequest($this->config, new SiteURI($this->config), null, new UserAgent());
         Services::injectMock('request', $this->request);
 
         // setup & ask for a redirect...
@@ -481,7 +481,7 @@ public function testOldInputArray(): void
         $this->routes = $this->createRouteCollection();
         Services::injectMock('routes', $this->routes);
 
-        $this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
+        $this->request = new MockIncomingRequest($this->config, new SiteURI($this->config), null, new UserAgent());
         Services::injectMock('request', $this->request);
 
         $locations = [
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 668cf9b1bc68..14756039c161 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -16,7 +16,7 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\Response;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Validation\Exceptions\ValidationException;
@@ -58,7 +58,7 @@ protected function setUp(): void
         parent::setUp();
 
         $this->config   = new App();
-        $this->request  = new IncomingRequest($this->config, new URI('https://somwhere.com'), null, new UserAgent());
+        $this->request  = new IncomingRequest($this->config, new SiteURI($this->config), null, new UserAgent());
         $this->response = new Response($this->config);
         $this->logger   = Services::logger();
     }
diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 6289ae755ce0..a7c40ebe8b20 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -13,7 +13,7 @@
 
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -53,7 +53,7 @@ protected function tearDown(): void
     private function createRequest(): IncomingRequest
     {
         $config    = new MockAppConfig();
-        $uri       = new URI();
+        $uri       = new SiteURI($config);
         $userAgent = new UserAgent();
         $request   = $this->getMockBuilder(IncomingRequest::class)
             ->setConstructorArgs([$config, $uri, null, $userAgent])
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 481821dd922b..9984e8d825b3 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -32,8 +32,7 @@ protected function setUp(): void
         $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
 
         // The URI object is not used in detectPath().
-        $origin        = 'http://www.example.com/index.php/woot?code=good#pos';
-        $this->request = new IncomingRequest(new App(), new URI($origin), null, new UserAgent());
+        $this->request = new IncomingRequest(new App(), new SiteURI(new App(), 'woot?code=good#pos'), null, new UserAgent());
     }
 
     public function testPathDefault(): void
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 9f6114f4875e..f9000d90001f 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -223,7 +223,7 @@ public function testSetValidLocales()
         $config->defaultLocale    = 'es';
         $config->baseURL          = 'http://example.com/';
 
-        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+        $request = new IncomingRequest($config, new SiteURI($config), null, new UserAgent());
 
         $request->setValidLocales(['ja']);
         $request->setLocale('ja');
@@ -901,7 +901,7 @@ public function testExtensionPHP($path, $detectPath): void
 
         $_SERVER['REQUEST_URI'] = $path;
         $_SERVER['SCRIPT_NAME'] = $path;
-        $request                = new IncomingRequest($config, new URI($path), null, new UserAgent());
+        $request                = new IncomingRequest($config, new SiteURI($config, $path), null, new UserAgent());
         $this->assertSame($detectPath, $request->detectPath());
     }
 
@@ -914,7 +914,8 @@ public function testGetPath(): void
 
     public function testSetPath(): void
     {
-        $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+        $config  = new App();
+        $request = new IncomingRequest($config, new SiteURI($config), null, new UserAgent());
         $this->assertSame('', $request->getPath());
 
         $request->setPath('foobar');
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index 45796658fecc..73f05123ab88 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -15,7 +15,7 @@
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockResponse;
@@ -49,7 +49,7 @@ protected function setUp(): void
 
         Services::injectMock('response', new MockResponse(new App()));
         $this->response = Services::response();
-        $this->request  = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+        $this->request  = new IncomingRequest(new App(), new SiteURI(new App()), null, new UserAgent());
         Services::injectMock('request', $this->request);
 
         helper('cookie');
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 63ae20d3cd0c..f5059f082b53 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Pager\Exceptions\PagerException;
@@ -53,7 +54,7 @@ private function createPager(string $requestUri): void
 
         $request = new IncomingRequest(
             $config,
-            new URI($config->baseURL . ltrim($requestUri, '/')),
+            new SiteURI($config, ltrim($requestUri, '/')),
             'php://input',
             new UserAgent()
         );
@@ -70,7 +71,7 @@ public function testSetPathRemembersPath(): void
 
         $details = $this->pager->getDetails();
 
-        $this->assertSame('foo/bar', $details['uri']->getPath());
+        $this->assertSame('foo/bar', $details['uri']->getRoutePath());
     }
 
     public function testGetDetailsRecognizesPageQueryVar(): void
@@ -474,7 +475,7 @@ public function testBasedURI(): void
 
         $request = new IncomingRequest(
             $config,
-            new URI(),
+            new SiteURI($config, 'x/y'),
             'php://input',
             new UserAgent()
         );
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index bd52bd0d31a5..284754280929 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -17,7 +17,7 @@
 use CodeIgniter\Format\XMLFormatter;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Model;
 use CodeIgniter\Router\RouteCollection;
@@ -312,7 +312,7 @@ public function testJSONFormatOutput(): void
         $resource = new MockResourceController();
 
         $config = new App();
-        $uri    = new URI();
+        $uri    = new SiteURI($config);
         $agent  = new UserAgent();
 
         $request  = new IncomingRequest($config, $uri, '', $agent);
@@ -340,7 +340,7 @@ public function testXMLFormatOutput(): void
         $resource = new MockResourceController();
 
         $config = new App();
-        $uri    = new URI();
+        $uri    = new SiteURI($config);
         $agent  = new UserAgent();
 
         $request  = new IncomingRequest($config, $uri, '', $agent);
diff --git a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php
index b0c1ef8ec707..a5c014814035 100644
--- a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php
@@ -14,7 +14,7 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockAppConfig;
@@ -74,7 +74,8 @@ public function testCSRFVerifySetNewCookie(): void
         $_POST['foo']              = 'bar';
         $_POST['csrf_test_name']   = $this->randomizedToken;
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $config  = new MockAppConfig();
+        $request = new IncomingRequest($config, new SiteURI($config), null, new UserAgent());
 
         $security = new Security($this->config);
 
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index 7c8af63040f4..e16093b76418 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -14,7 +14,7 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Session\Handlers\ArrayHandler;
@@ -25,6 +25,7 @@
 use CodeIgniter\Test\Mock\MockSecurity;
 use CodeIgniter\Test\Mock\MockSession;
 use CodeIgniter\Test\TestLogger;
+use Config\App;
 use Config\Cookie;
 use Config\Logger as LoggerConfig;
 use Config\Security as SecurityConfig;
@@ -136,13 +137,19 @@ public function testCSRFVerifyPostNoToken(): void
         $_SERVER['REQUEST_METHOD'] = 'POST';
         unset($_POST['csrf_test_name']);
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $security->verify($request);
     }
 
+    private function createIncomingRequest(?App $config = null): IncomingRequest
+    {
+        $config ??= new MockAppConfig();
+
+        return new IncomingRequest($config, new SiteURI($config), null, new UserAgent());
+    }
+
     public function testCSRFVerifyPostThrowsExceptionOnNoMatch(): void
     {
         $this->expectException(SecurityException::class);
@@ -151,8 +158,7 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch(): void
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005b';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $security->verify($request);
@@ -166,8 +172,7 @@ public function testCSRFVerifyPostInvalidToken(): void
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['csrf_test_name']   = '!';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $security->verify($request);
@@ -179,8 +184,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch(): void
         $_POST['foo']              = 'bar';
         $_POST['csrf_test_name']   = $this->randomizedToken;
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -192,9 +196,8 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
-
         $security = $this->createSecurity();
 
         $this->expectException(SecurityException::class);
@@ -208,9 +211,8 @@ public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch(): void
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['foo']              = 'bar';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken);
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -222,9 +224,8 @@ public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
-
         $security = $this->createSecurity();
 
         $this->expectException(SecurityException::class);
@@ -237,9 +238,8 @@ public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken);
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -250,9 +250,8 @@ public function testCSRFVerifyPUTBodyReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setBody("csrf_test_name={$this->randomizedToken}&foo=bar");
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -266,9 +265,8 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch(): void
 
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}');
-
         $security = $this->createSecurity();
 
         $security->verify($request);
@@ -278,9 +276,8 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setBody('{"csrf_test_name":"' . $this->randomizedToken . '","foo":"bar"}');
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -298,9 +295,8 @@ public function testRegenerateWithFalseSecurityRegenerateProperty(): void
         $config->regenerate     = false;
         Factories::injectMock('config', 'Security', $config);
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
-        $security = new MockSecurity($this->config);
+        $request  = $this->createIncomingRequest();
+        $security = new MockSecurity($config);
 
         $oldHash = $security->getHash();
         $security->verify($request);
@@ -319,8 +315,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty(): void
         $config->regenerate     = true;
         Factories::injectMock('config', 'Security', $config);
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $oldHash = $security->getHash();
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
index 1d701520488c..cc5b56eae33a 100644
--- a/tests/system/Security/SecurityCSRFSessionTest.php
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -14,7 +14,7 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Session\Handlers\ArrayHandler;
@@ -24,6 +24,7 @@
 use CodeIgniter\Test\Mock\MockAppConfig;
 use CodeIgniter\Test\Mock\MockSession;
 use CodeIgniter\Test\TestLogger;
+use Config\App;
 use Config\Cookie;
 use Config\Logger as LoggerConfig;
 use Config\Security as SecurityConfig;
@@ -125,21 +126,26 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch(): void
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005b';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $security->verify($request);
     }
 
+    private function createIncomingRequest(?App $config = null): IncomingRequest
+    {
+        $config ??= new MockAppConfig();
+
+        return new IncomingRequest($config, new SiteURI($config), null, new UserAgent());
+    }
+
     public function testCSRFVerifyPostReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['foo']              = 'bar';
         $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005a';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -151,9 +157,8 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
-
         $security = $this->createSecurity();
 
         $this->expectException(SecurityException::class);
@@ -165,9 +170,8 @@ public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch(): void
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['foo']              = 'bar';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -179,9 +183,8 @@ public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
-
         $security = $this->createSecurity();
 
         $this->expectException(SecurityException::class);
@@ -192,9 +195,8 @@ public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -205,9 +207,8 @@ public function testCSRFVerifyPUTBodyReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setBody('csrf_test_name=8b9218a55906f9dcc1dc263dce7f005a&foo=bar');
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -220,9 +221,8 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch(): void
 
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}');
-
         $security = $this->createSecurity();
 
         $security->verify($request);
@@ -232,9 +232,8 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request = $this->createIncomingRequest();
         $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}');
-
         $security = $this->createSecurity();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
@@ -251,8 +250,7 @@ public function testRegenerateWithFalseSecurityRegenerateProperty(): void
         $config->regenerate = false;
         Factories::injectMock('config', 'Security', $config);
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $oldHash = $security->getHash();
@@ -271,8 +269,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty(): void
         $config->regenerate = true;
         Factories::injectMock('config', 'Security', $config);
 
-        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
+        $request  = $this->createIncomingRequest();
         $security = $this->createSecurity();
 
         $oldHash = $security->getHash();
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index ae4953607662..f10c79e5fb7c 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -14,7 +14,7 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Request;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -101,17 +101,24 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $this->expectException(SecurityException::class);
         $security->verify($request);
     }
 
+    private function createIncomingRequest(): IncomingRequest
+    {
+        $config = new MockAppConfig();
+
+        return new IncomingRequest(
+            $config,
+            new SiteURI($config),
+            null,
+            new UserAgent()
+        );
+    }
+
     public function testCSRFVerifyPostReturnsSelfOnMatch(): void
     {
         $_SERVER['REQUEST_METHOD']   = 'POST';
@@ -120,12 +127,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
@@ -139,12 +141,7 @@ public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
@@ -159,12 +156,7 @@ public function testCSRFVerifyHeaderReturnsSelfOnMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
@@ -180,12 +172,7 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $request->setBody(
             '{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a"}'
@@ -201,12 +188,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $request->setBody(
             '{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}'
@@ -224,12 +206,7 @@ public function testCSRFVerifyPutBodyThrowsExceptionOnNoMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $request->setBody(
             'csrf_test_name=8b9218a55906f9dcc1dc263dce7f005a'
@@ -245,12 +222,7 @@ public function testCSRFVerifyPutBodyReturnsSelfOnMatch(): void
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
         $security = $this->createMockSecurity();
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $request->setBody(
             'csrf_test_name=8b9218a55906f9dcc1dc263dce7f005a&foo=bar'
@@ -282,12 +254,7 @@ public function testRegenerateWithFalseSecurityRegenerateProperty(): void
         Factories::injectMock('config', 'Security', $config);
 
         $security = new MockSecurity($config);
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $oldHash = $security->getHash();
         $security->verify($request);
@@ -307,12 +274,7 @@ public function testRegenerateWithFalseSecurityRegeneratePropertyManually(): voi
         Factories::injectMock('config', 'Security', $config);
 
         $security = $this->createMockSecurity($config);
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $oldHash = $security->getHash();
         $security->verify($request);
@@ -333,12 +295,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty(): void
         Factories::injectMock('config', 'Security', $config);
 
         $security = $this->createMockSecurity($config);
-        $request  = new IncomingRequest(
-            new MockAppConfig(),
-            new URI('http://badurl.com'),
-            null,
-            new UserAgent()
-        );
+        $request  = $this->createIncomingRequest();
 
         $oldHash = $security->getHash();
         $security->verify($request);
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 7cc6f99c40d5..fbc8f2ace5f6 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Validation\Exceptions\ValidationException;
@@ -748,7 +748,7 @@ public function testRawInput(): void
         $rawstring       = 'username=admin001&role=administrator&usepass=0';
         $config          = new App();
         $config->baseURL = 'http://example.com/';
-        $request         = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
+        $request         = new IncomingRequest($config, new SiteURI($config), $rawstring, new UserAgent());
 
         $rules = [
             'role' => 'required|min_length[5]',
@@ -772,7 +772,7 @@ public function testJsonInput(): void
         $json            = json_encode($data);
         $config          = new App();
         $config->baseURL = 'http://example.com/';
-        $request         = new IncomingRequest($config, new URI(), $json, new UserAgent());
+        $request         = new IncomingRequest($config, new SiteURI($config), $json, new UserAgent());
 
         $rules = [
             'role' => 'required|min_length[5]',
@@ -809,7 +809,7 @@ public function testJsonInputObjectArray(): void
         $config          = new App();
         $config->baseURL = 'http://example.com/';
 
-        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+        $request = new IncomingRequest($config, new SiteURI($config), $json, new UserAgent());
 
         $rules = [
             'p' => 'required|array_count[2]',
@@ -995,7 +995,7 @@ public function testRulesForArrayField(array $body, array $rules, array $results
         $config          = new App();
         $config->baseURL = 'http://example.com/';
 
-        $request = new IncomingRequest($config, new URI(), http_build_query($body), new UserAgent());
+        $request = new IncomingRequest($config, new SiteURI($config), http_build_query($body), new UserAgent());
 
         $this->validation->setRules($rules);
         $this->validation->withRequest($request->withMethod('post'))->run($body);
@@ -1074,7 +1074,7 @@ public function testRulesForSingleRuleWithAsteriskWillReturnNoError(): void
             ],
         ];
 
-        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+        $request = new IncomingRequest($config, new SiteURI($config), 'php://input', new UserAgent());
 
         $this->validation->setRules([
             'id_user.*'   => 'numeric',
@@ -1108,7 +1108,7 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
             ],
         ];
 
-        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+        $request = new IncomingRequest($config, new SiteURI($config), 'php://input', new UserAgent());
 
         $this->validation->setRules([
             'id_user.*'               => 'numeric',
@@ -1144,7 +1144,7 @@ public function testRulesForSingleRuleWithSingleValue(): void
             'id_user' => 'gh',
         ];
 
-        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+        $request = new IncomingRequest($config, new SiteURI($config), 'php://input', new UserAgent());
 
         $this->validation->setRules([
             'id_user' => 'numeric',

From ee7020f2185de2a9ccfca915631643e6b41eebf4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Nov 2023 06:49:06 +0900
Subject: [PATCH 129/380] docs: add missing `get` in method name

---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 92daf06b7be6..3ba27117468f 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -763,7 +763,7 @@ when a controller is found that matches the URI, but no segment exists for the m
 ``index``.
 
 In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
-``Products::listAll()`` method would be executed:
+``Products::getListAll()`` method would be executed:
 
 .. literalinclude:: routing/048.php
 

From 0cdd2996588e3f0c5383d35ece4c5e55a3fb601e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Nov 2023 07:05:13 +0900
Subject: [PATCH 130/380] docs: add about Controller returns string/Response

---
 user_guide_src/source/incoming/controllers.rst             | 4 +++-
 user_guide_src/source/installation/upgrade_controllers.rst | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index bf5a747cb462..eda94fcf447a 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -11,7 +11,9 @@ Controllers are the heart of your application, as they determine how HTTP reques
 What is a Controller?
 *********************
 
-A Controller is simply a class file that handles a HTTP request. :doc:`URI Routing <routing>` associates a URI with a controller.
+A Controller is simply a class file that handles a HTTP request.
+:doc:`URI Routing <routing>` associates a URI with a controller. It returns a
+view string or ``Response`` object.
 
 Every controller you create should extend ``BaseController`` class.
 This class provides several features that are available to all of your controllers.
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index cd5f17fd3d22..1a2dc9a9b4ce 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -20,6 +20,8 @@ What has been changed
 - CI4 provides :doc:`Request </incoming/incomingrequest>` and :doc:`Responses </outgoing/response>`
   objects for you to work with - more powerful than the CI3-way.
 - If you want a base controller (``MY_Controller`` in CI3), use **app/Controllers/BaseController.php**.
+- Calling ``echo`` within Controllers, as in CI3, is still supported, but
+  it is recommended that a string or Response object be returned from Controllers.
 
 Upgrade Guide
 =============

From fbd0ebe7e6c82340ef4cb1ac0db74f8944a8cb2a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Nov 2023 08:33:27 +0900
Subject: [PATCH 131/380] docs: change expressions

---
 user_guide_src/source/models/model.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 6a2700520fd0..d8cefa02c1cb 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -180,13 +180,13 @@ $createdField
 ^^^^^^^^^^^^^
 
 Specifies which database field to use for data record create timestamp.
-Leave it empty (``''``) to avoid updating it (even if ``$useTimestamps`` is enabled).
+Set to an empty string (``''``) to avoid updating it (even if ``$useTimestamps`` is enabled).
 
 $updatedField
 ^^^^^^^^^^^^^
 
 Specifies which database field should use for keep data record update timestamp.
-Leave it empty (``''``) to avoid updating it (even ``$useTimestamps`` is enabled).
+Set to an empty string (``''``) to avoid updating it (even ``$useTimestamps`` is enabled).
 
 $deletedField
 ^^^^^^^^^^^^^

From ac4430863401c15882b33fc7fa6625391ef85690 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Nov 2023 09:04:53 +0900
Subject: [PATCH 132/380] docs: change model event order

Place batch methods after.
---
 user_guide_src/source/models/model.rst | 47 +++++++++++++++-----------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index d8cefa02c1cb..e6b6ec448b16 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -244,18 +244,10 @@ $beforeInsert
 ^^^^^^^^^^^^^
 $afterInsert
 ^^^^^^^^^^^^
-$beforeInsertBatch
-^^^^^^^^^^^^^^^^^^
-$afterInsertBatch
-^^^^^^^^^^^^^^^^^
 $beforeUpdate
 ^^^^^^^^^^^^^
 $afterUpdate
 ^^^^^^^^^^^^^
-$beforeUpdateBatch
-^^^^^^^^^^^^^^^^^^
-$afterUpdateBatch
-^^^^^^^^^^^^^^^^^
 $beforeFind
 ^^^^^^^^^^^
 $afterFind
@@ -264,6 +256,14 @@ $beforeDelete
 ^^^^^^^^^^^^^
 $afterDelete
 ^^^^^^^^^^^^
+$beforeInsertBatch
+^^^^^^^^^^^^^^^^^^
+$afterInsertBatch
+^^^^^^^^^^^^^^^^^
+$beforeUpdateBatch
+^^^^^^^^^^^^^^^^^^
+$afterUpdateBatch
+^^^^^^^^^^^^^^^^^
 
 These arrays allow you to specify callback methods that will be run on the data at the
 time specified in the property name.
@@ -718,10 +718,17 @@ Model Events
 ************
 
 There are several points within the model's execution that you can specify multiple callback methods to run.
-These methods can be used to normalize data, hash passwords, save related entities, and much more. The following
-points in the model's execution can be affected, each through a class property: ``$beforeInsert``, ``$afterInsert``,
-``$beforeInsertBatch``, ``$afterInsertBatch``, ``$beforeUpdate``, ``$afterUpdate``, ``$beforeUpdateBatch``,
-``$afterUpdateBatch``, ``$afterFind``, and ``$afterDelete``.
+These methods can be used to normalize data, hash passwords, save related entities, and much more.
+
+The following
+points in the model's execution can be affected, each through a class property:
+
+- `$beforeInsert`_, `$afterInsert`_
+- `$beforeUpdate`_, `$afterUpdate`_
+- `$beforeFind`_, `$afterFind`_
+- `$beforeDelete`_, `$afterDelete`_
+- `$beforeInsertBatch`_, `$afterInsertBatch`_
+- `$beforeUpdateBatch`_, `$afterUpdateBatch`_
 
 .. note:: ``$beforeInsertBatch``, ``$afterInsertBatch``, ``$beforeUpdateBatch`` and
     ``$afterUpdateBatch`` can be used since v4.3.0.
@@ -769,20 +776,12 @@ beforeInsert      **data** = the key/value pairs that are being inserted. If an
 afterInsert       **id** = the primary key of the new row, or 0 on failure.
                   **data** = the key/value pairs being inserted.
                   **result** = the results of the insert() method used through the Query Builder.
-beforeInsertBatch **data** = associative array of values that are being inserted. If an object or Entity class is passed to the
-                  insertBatch method, it is first converted to an array.
-afterInsertBatch  **data** = the associative array of values being inserted.
-                  **result** = the results of the insertbatch() method used through the Query Builder.
 beforeUpdate      **id** = the array of primary keys of the rows being updated.
                   **data** = the key/value pairs that are being updated. If an object or Entity class is passed to the
                   update method, it is first converted to an array.
 afterUpdate       **id** = the array of primary keys of the rows being updated.
                   **data** = the key/value pairs being updated.
                   **result** = the results of the update() method used through the Query Builder.
-beforeUpdateBatch **data** = associative array of values that are being updated. If an object or Entity class is passed to the
-                  updateBatch method, it is first converted to an array.
-afterUpdateBatch  **data** = the key/value pairs being updated.
-                  **result** = the results of the updateBatch() method used through the Query Builder.
 beforeFind        The name of the calling **method**, whether a **singleton** was requested, and these additional fields:
 - first()         No additional fields
 - find()          **id** = the primary key of the row being searched for.
@@ -796,6 +795,14 @@ afterDelete       **id** = primary key of row being deleted.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
                   **result** = the result of the delete() call on the Query Builder.
                   **data** = unused.
+beforeInsertBatch **data** = associative array of values that are being inserted. If an object or Entity class is passed to the
+                  insertBatch method, it is first converted to an array.
+afterInsertBatch  **data** = the associative array of values being inserted.
+                  **result** = the results of the insertbatch() method used through the Query Builder.
+beforeUpdateBatch **data** = associative array of values that are being updated. If an object or Entity class is passed to the
+                  updateBatch method, it is first converted to an array.
+afterUpdateBatch  **data** = the key/value pairs being updated.
+                  **result** = the results of the updateBatch() method used through the Query Builder.
 ================= =========================================================================================================
 
 Modifying Find* Data

From ab2d13de0e474cc214834130c20cb79295094cfc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Nov 2023 09:15:05 +0900
Subject: [PATCH 133/380] docs: make property names links

---
 user_guide_src/source/models/model.rst | 52 +++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index e6b6ec448b16..a83ca4082130 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -111,12 +111,12 @@ is used with methods like ``find()`` to know what column to match the specified
 $useAutoIncrement
 -----------------
 
-Specifies if the table uses an auto-increment feature for ``$primaryKey``. If set to ``false``
+Specifies if the table uses an auto-increment feature for `$primaryKey`_. If set to ``false``
 then you are responsible for providing primary key value for every record in the table. This
 feature may be handy when we want to implement 1:1 relation or use UUIDs for our model. The
 default value is ``true``.
 
-.. note:: If you set ``$useAutoIncrement`` to ``false``, then make sure to set your primary
+.. note:: If you set `$useAutoIncrement`_ to ``false``, then make sure to set your primary
     key in the database to ``unique``. This way you will make sure that all of Model's features
     will still work the same as before.
 
@@ -142,8 +142,8 @@ part of a security trail. If true, the **find*()** methods will only return non-
 the ``withDeleted()`` method is called prior to calling the **find*()** method.
 
 This requires either a DATETIME or INTEGER field in the database as per the model's
-``$dateFormat`` setting. The default field name is ``deleted_at`` however this name can be
-configured to any name of your choice by using ``$deletedField`` property.
+`$dateFormat`_ setting. The default field name is ``deleted_at`` however this name can be
+configured to any name of your choice by using `$deletedField`_ property.
 
 .. important:: The ``deleted_at`` field must be nullable.
 
@@ -155,7 +155,7 @@ This array should be updated with the field names that can be set during ``save(
 against just taking input from a form and throwing it all at the model, resulting in
 potential mass assignment vulnerabilities.
 
-.. note:: The ``$primaryKey`` field should never be an allowed field.
+.. note:: The `$primaryKey`_ field should never be an allowed field.
 
 Dates
 -----
@@ -164,29 +164,29 @@ $useTimestamps
 ^^^^^^^^^^^^^^
 
 This boolean value determines whether the current date is automatically added to all inserts
-and updates. If true, will set the current time in the format specified by ``$dateFormat``. This
+and updates. If ``true``, will set the current time in the format specified by `$dateFormat`_. This
 requires that the table have columns named **created_at**, **updated_at** and **deleted_at** in the appropriate
 data type.
 
 $dateFormat
 ^^^^^^^^^^^
 
-This value works with ``$useTimestamps`` and ``$useSoftDeletes`` to ensure that the correct type of
+This value works with `$useTimestamps`_ and `$useSoftDeletes`_ to ensure that the correct type of
 date value gets inserted into the database. By default, this creates DATETIME values, but
-valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a PHP timestamp). Using **useSoftDeletes** or
-**useTimestamps** with an invalid or missing **dateFormat** will cause an exception.
+valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a PHP timestamp). Using `$useSoftDeletes`_ or
+`$useTimestamps`_ with an invalid or missing `$dateFormat`_ will cause an exception.
 
 $createdField
 ^^^^^^^^^^^^^
 
 Specifies which database field to use for data record create timestamp.
-Set to an empty string (``''``) to avoid updating it (even if ``$useTimestamps`` is enabled).
+Set to an empty string (``''``) to avoid updating it (even if `$useTimestamps`_ is enabled).
 
 $updatedField
 ^^^^^^^^^^^^^
 
 Specifies which database field should use for keep data record update timestamp.
-Set to an empty string (``''``) to avoid updating it (even ``$useTimestamps`` is enabled).
+Set to an empty string (``''``) to avoid updating it (even `$useTimestamps`_ is enabled).
 
 $deletedField
 ^^^^^^^^^^^^^
@@ -284,7 +284,7 @@ Returns a single row where the primary key matches the value passed in as the fi
 
 .. literalinclude:: model/006.php
 
-The value is returned in the format specified in ``$returnType``.
+The value is returned in the format specified in `$returnType`_.
 
 You can specify more than one row to return by passing an array of primaryKey values instead
 of just one:
@@ -329,7 +329,7 @@ Returns the first row in the result set. This is best used in combination with t
 withDeleted()
 -------------
 
-If ``$useSoftDeletes`` is true, then the **find*()** methods will not return any rows where ``deleted_at IS NOT NULL``.
+If `$useSoftDeletes`_ is true, then the **find*()** methods will not return any rows where ``deleted_at IS NOT NULL``.
 To temporarily override this, you can use the ``withDeleted()`` method prior to calling the **find*()** method.
 
 .. literalinclude:: model/013.php
@@ -351,7 +351,7 @@ insert()
 The first parameter is an associative array of data to create a new row of data in the database.
 If an object is passed instead of an array, it will attempt to convert it to an array.
 
-The array's keys must match the name of the columns in the ``$table``, while the array's values are the values to save for that key.
+The array's keys must match the name of the columns in the `$table`_, while the array's values are the values to save for that key.
 
 The optional second parameter is of type boolean, and if it is set to false, the method will return a boolean value,
 which indicates the success or failure of the query.
@@ -376,15 +376,15 @@ You can enable the check again by calling ``allowEmptyInserts(false)``.
 update()
 --------
 
-Updates an existing record in the database. The first parameter is the ``$primaryKey`` of the record to update.
+Updates an existing record in the database. The first parameter is the `$primaryKey`_ of the record to update.
 An associative array of data is passed into this method as the second parameter. The array's keys must match the name
-of the columns in a ``$table``, while the array's values are the values to save for that key:
+of the columns in a `$table`_, while the array's values are the values to save for that key:
 
 .. literalinclude:: model/016.php
 
 .. important:: Since v4.3.0, this method raises a ``DatabaseException``
     if it generates an SQL statement without a WHERE clause.
-    In previous versions, if it is called without ``$primaryKey`` specified and
+    In previous versions, if it is called without `$primaryKey`_ specified and
     an SQL statement was generated without a WHERE clause, the query would still
     execute and all records in the table would be updated.
 
@@ -440,7 +440,7 @@ Takes a primary key value as the first parameter and deletes the matching record
 
 .. literalinclude:: model/023.php
 
-If the model's ``$useSoftDeletes`` value is true, this will update the row to set ``deleted_at`` to the current
+If the model's `$useSoftDeletes`_ value is true, this will update the row to set ``deleted_at`` to the current
 date and time. You can force a permanent delete by setting the second parameter as true.
 
 An array of primary keys can be passed in as the first parameter to delete multiple records at once:
@@ -481,13 +481,13 @@ prior to saving to the database with the ``insert()``, ``update()``, or ``save()
 Setting Validation Rules
 ------------------------
 
-The first step is to fill out the ``$validationRules`` class property with the fields and rules that should
-be applied. If you have custom error message that you want to use, place them in the ``$validationMessages`` array:
+The first step is to fill out the `$validationRules`_ class property with the fields and rules that should
+be applied. If you have custom error message that you want to use, place them in the `$validationMessages`_ array:
 
 .. literalinclude:: model/027.php
 
 If you'd rather organize your rules and error messages within the Validation configuration file, you can do that
-and simply set ``$validationRules`` to the name of the validation rule group you created:
+and simply set `$validationRules`_ to the name of the validation rule group you created:
 
 .. literalinclude:: model/034.php
 
@@ -614,7 +614,7 @@ Protecting Fields
 =================
 
 To help protect against Mass Assignment Attacks, the Model class **requires** that you list all of the field names
-that can be changed during inserts and updates in the ``$allowedFields`` class property. Any data provided
+that can be changed during inserts and updates in the `$allowedFields`_ class property. Any data provided
 in addition to these will be removed prior to hitting the database. This is great for ensuring that timestamps,
 or primary keys do not get changed.
 
@@ -629,7 +629,7 @@ Runtime Return Type Changes
 ===========================
 
 You can specify the format that data should be returned as when using the **find*()** methods as the class property,
-``$returnType``. There may be times that you would like the data back in a different format, though. The Model
+`$returnType`_. There may be times that you would like the data back in a different format, though. The Model
 provides methods that allow you to do just that.
 
 .. note:: These methods only change the return type for the next **find*()** method call. After that,
@@ -674,7 +674,7 @@ You can get access to the **shared** instance of the Query Builder any time you
 
 .. literalinclude:: model/043.php
 
-This builder is already set up with the model's ``$table``.
+This builder is already set up with the model's `$table`_.
 
 .. note:: Once you get the Query Builder instance, you can call methods of the
     :doc:`Query Builder <../database/query_builder>`.
@@ -748,13 +748,13 @@ must return the original $data array so other callbacks have the full informatio
 Specifying Callbacks To Run
 ===========================
 
-You specify when to run the callbacks by adding the method name to the appropriate class property (``$beforeInsert``, ``$afterUpdate``,
+You specify when to run the callbacks by adding the method name to the appropriate class property (`$beforeInsert`_, `$afterUpdate`_,
 etc). Multiple callbacks can be added to a single event and they will be processed one after the other. You can
 use the same callback in multiple events:
 
 .. literalinclude:: model/051.php
 
-Additionally, each model may allow (default) or deny callbacks class-wide by setting its ``$allowCallbacks`` property:
+Additionally, each model may allow (default) or deny callbacks class-wide by setting its `$allowCallbacks`_ property:
 
 .. literalinclude:: model/052.php
 

From de0f67fc1ca86a8680d1599d261b335c183a7c26 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Nov 2023 09:16:27 +0900
Subject: [PATCH 134/380] docs: add references in page

---
 user_guide_src/source/models/model.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index a83ca4082130..5481265231e9 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -166,7 +166,7 @@ $useTimestamps
 This boolean value determines whether the current date is automatically added to all inserts
 and updates. If ``true``, will set the current time in the format specified by `$dateFormat`_. This
 requires that the table have columns named **created_at**, **updated_at** and **deleted_at** in the appropriate
-data type.
+data type. See also `$createdField`_, `$updatedField`_, and `$deletedField`_.
 
 $dateFormat
 ^^^^^^^^^^^
@@ -238,7 +238,7 @@ Callbacks
 $allowCallbacks
 ^^^^^^^^^^^^^^^
 
-Whether the callbacks defined below should be used.
+Whether the callbacks defined below should be used. See :ref:`model-events`.
 
 $beforeInsert
 ^^^^^^^^^^^^^
@@ -266,7 +266,7 @@ $afterUpdateBatch
 ^^^^^^^^^^^^^^^^^
 
 These arrays allow you to specify callback methods that will be run on the data at the
-time specified in the property name.
+time specified in the property name. See :ref:`model-events`.
 
 Working with Data
 *****************
@@ -714,6 +714,8 @@ and specify the model's method at the end of the method chaining.
 
     .. literalinclude:: model/046.php
 
+.. _model-events:
+
 Model Events
 ************
 

From aed2800f94d9914192dc136893e2b46548eb33a5 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 13 Nov 2023 17:08:06 +0700
Subject: [PATCH 135/380] [Rector] Fix deprecated dynamic pull
 phpDocInfoFactory from AbstractRector on
 UnderscoreToCamelCaseVariableNameRector

---
 utils/Rector/UnderscoreToCamelCaseVariableNameRector.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index 3cadde86d3f7..4af0be534e61 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -21,6 +21,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Namespace_;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Php\ReservedKeywordAnalyzer;
 use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\Core\Rector\AbstractRector;
@@ -39,12 +40,15 @@ final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector
     private const PARAM_NAME_REGEX = '#(?<paramPrefix>@param\s.*\s+\$)(?<paramName>%s)#ms';
 
     private ReservedKeywordAnalyzer $reservedKeywordAnalyzer;
+    private PhpDocInfoFactory $phpDocInfoFactory;
     private bool $hasChanged = false;
 
     public function __construct(
-        ReservedKeywordAnalyzer $reservedKeywordAnalyzer
+        ReservedKeywordAnalyzer $reservedKeywordAnalyzer,
+        PhpDocInfoFactory $phpDocInfoFactory
     ) {
         $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer;
+        $this->phpDocInfoFactory       = $phpDocInfoFactory;
     }
 
     public function getRuleDefinition(): RuleDefinition

From 6ca37592f7a868d1e41a7941fe04ebc6d33e6884 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:16:41 +0000
Subject: [PATCH 136/380] chore(deps-dev): update rector/rector requirement
 from 0.18.6 to 0.18.7

Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](https://github.com/rectorphp/rector/compare/0.18.6...0.18.7)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9e0288c26f6b..7f00c4c6efa0 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.6",
+        "rector/rector": "0.18.7",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

From 59649ea661281fee653d31613acb5a628866cc9f Mon Sep 17 00:00:00 2001
From: webalchemist <colin@webalchemist.co.uk>
Date: Tue, 14 Nov 2023 01:53:10 +0000
Subject: [PATCH 137/380] Update 002.php

Updated RouteCollection constructor parameters
---
 user_guide_src/source/extending/core_classes/002.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/extending/core_classes/002.php b/user_guide_src/source/extending/core_classes/002.php
index 68d22ff508b8..40d7342686a0 100644
--- a/user_guide_src/source/extending/core_classes/002.php
+++ b/user_guide_src/source/extending/core_classes/002.php
@@ -12,7 +12,7 @@ public static function routes(bool $getShared = true)
             return static::getSharedInstance('routes');
         }
 
-        return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
+        return new \App\Libraries\RouteCollection(static::locator(), config(Modules::class), config(Routing::class) );
     }
 
     // ...

From e56e4606a66cffb6ed0fe6545c77900aa7969aa2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Nov 2023 21:37:59 +0900
Subject: [PATCH 138/380] test: add test for baseURL with subfolder

---
 tests/system/CommonFunctionsTest.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 228a24e9a26f..a097cb2a81a0 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -612,6 +612,7 @@ public function testViewNotSaveData(): void
     public function testForceHttpsNullRequestAndResponse(): void
     {
         $this->assertNull(Services::response()->header('Location'));
+
         Services::response()->setCookie('force', 'cookie');
         Services::response()->setHeader('Force', 'header');
         Services::response()->setBody('default body');
@@ -634,6 +635,25 @@ public function testForceHttpsNullRequestAndResponse(): void
         force_https();
     }
 
+    public function testForceHttpsWithBaseUrlSubFolder(): void
+    {
+        $config          = config(App::class);
+        $config->baseURL = 'https://example.jp/codeIgniter/';
+        $uri             = new SiteURI($config, 'en/home?foo=bar');
+        $request         = new IncomingRequest($config, $uri, '', new UserAgent());
+        Services::injectMock('request', $request);
+
+        try {
+            force_https();
+        } catch (Exception $e) {
+            $this->assertInstanceOf(RedirectException::class, $e);
+            $this->assertSame(
+                'https://example.jp/codeIgniter/index.php/en/home?foo=bar',
+                $e->getResponse()->header('Location')->getValue()
+            );
+        }
+    }
+
     /**
      * @dataProvider provideCleanPathActuallyCleaningThePaths
      *

From d59fdaad5ab207d61fff9c0c4a98141c730b6af3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Nov 2023 19:59:39 +0900
Subject: [PATCH 139/380] fix: force_https() redirects to wrong URL

---
 system/Common.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 2d876564846e..451e6c601a63 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -502,27 +502,11 @@ function force_https(
             Services::session()->regenerate(); // @codeCoverageIgnore
         }
 
-        $baseURL = config(App::class)->baseURL;
-
-        if (strpos($baseURL, 'https://') === 0) {
-            $authority = substr($baseURL, strlen('https://'));
-        } elseif (strpos($baseURL, 'http://') === 0) {
-            $authority = substr($baseURL, strlen('http://'));
-        } else {
-            $authority = $baseURL;
-        }
-
-        $uri = URI::createURIString(
-            'https',
-            $authority,
-            $request->getUri()->getPath(), // Absolute URIs should use a "/" for an empty path
-            $request->getUri()->getQuery(),
-            $request->getUri()->getFragment()
-        );
+        $uri = $request->getUri()->withScheme('https');
 
         // Set an HSTS header
         $response->setHeader('Strict-Transport-Security', 'max-age=' . $duration)
-            ->redirect($uri)
+            ->redirect((string) $uri)
             ->setStatusCode(307)
             ->setBody('')
             ->getCookieStore()

From b25ff87a8e748807863d11256b508170e9cc9fd4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Nov 2023 13:14:46 +0900
Subject: [PATCH 140/380] docs: add @phpstan-param

---
 system/View/RendererInterface.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
index 409a5a76d3ba..a0f093b67326 100644
--- a/system/View/RendererInterface.php
+++ b/system/View/RendererInterface.php
@@ -46,6 +46,7 @@ public function renderString(string $view, ?array $options = null, bool $saveDat
      *
      * @param string $context The context to escape it for: html, css, js, url
      *                        If 'raw', no escaping will happen
+     * @phpstan-param null|'html'|'js'|'css'|'url'|'attr'|'raw' $context
      *
      * @return RendererInterface
      */
@@ -57,6 +58,7 @@ public function setData(array $data = [], ?string $context = null);
      * @param mixed  $value
      * @param string $context The context to escape it for: html, css, js, url
      *                        If 'raw' no escaping will happen
+     * @phpstan-param null|'html'|'js'|'css'|'url'|'attr'|'raw' $context
      *
      * @return RendererInterface
      */

From 8fbeb9364be142060a9a0d1a57f2444fc21836b2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Nov 2023 13:15:41 +0900
Subject: [PATCH 141/380] refactor: replace empty()

---
 system/View/Cell.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/system/View/Cell.php b/system/View/Cell.php
index f654e97a376d..de9bbe636e4e 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -84,11 +84,9 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c
         $params = $this->prepareParams($params);
 
         // Is the output cached?
-        $cacheName = ! empty($cacheName)
-            ? $cacheName
-            : str_replace(['\\', '/'], '', $class) . $method . md5(serialize($params));
+        $cacheName ??= str_replace(['\\', '/'], '', $class) . $method . md5(serialize($params));
 
-        if (! empty($this->cache) && $output = $this->cache->get($cacheName)) {
+        if ($output = $this->cache->get($cacheName)) {
             return $output;
         }
 
@@ -105,7 +103,7 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c
             : $this->renderSimpleClass($instance, $method, $params, $class);
 
         // Can we cache it?
-        if (! empty($this->cache) && $ttl !== 0) {
+        if ($ttl !== 0) {
             $this->cache->save($cacheName, $output, $ttl);
         }
 
@@ -119,11 +117,14 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c
      *
      * @param array|string|null $params
      *
-     * @return array|null
+     * @return array
      */
     public function prepareParams($params)
     {
-        if (empty($params) || (! is_string($params) && ! is_array($params))) {
+        if (
+            ($params === null || $params === '' || $params === [])
+            || (! is_string($params) && ! is_array($params))
+        ) {
             return [];
         }
 
@@ -139,7 +140,7 @@ public function prepareParams($params)
             unset($separator);
 
             foreach ($params as $p) {
-                if (! empty($p)) {
+                if ($p !== '') {
                     [$key, $val] = explode('=', $p);
 
                     $newParams[trim($key)] = trim($val, ', ');
@@ -175,7 +176,7 @@ protected function determineClass(string $library): array
 
         [$class, $method] = explode(':', $library);
 
-        if (empty($class)) {
+        if ($class === '') {
             throw ViewException::forNoCellClass();
         }
 
@@ -187,7 +188,7 @@ protected function determineClass(string $library): array
             throw ViewException::forInvalidCellClass($class);
         }
 
-        if (empty($method)) {
+        if ($method === '') {
             $method = 'index';
         }
 
@@ -274,7 +275,7 @@ final protected function renderSimpleClass($instance, string $method, array $par
         $refParams  = $refMethod->getParameters();
 
         if ($paramCount === 0) {
-            if (! empty($params)) {
+            if ($params !== []) {
                 throw ViewException::forMissingCellParameters($class, $method);
             }
 

From 6ddc920f0a368b1157bfae16c2ec6353900943ce Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Nov 2023 13:15:58 +0900
Subject: [PATCH 142/380] chore: phpstan-baseline.php

---
 phpstan-baseline.php | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index beb2d85a4d84..7f9182eeeeda 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -3951,16 +3951,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/View/Cell.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
-	'path' => __DIR__ . '/system/View/Cell.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\View\\\\Cell\\:\\:\\$cache \\(CodeIgniter\\\\Cache\\\\CacheInterface\\) in empty\\(\\) is not falsy\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/View/Cell.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -4006,16 +3996,6 @@
 	'count' => 3,
 	'path' => __DIR__ . '/system/View/View.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Parameter \\#2 \\$context \\(\'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null\\) of method CodeIgniter\\\\View\\\\View\\:\\:setData\\(\\) should be contravariant with parameter \\$context \\(string\\|null\\) of method CodeIgniter\\\\View\\\\RendererInterface\\:\\:setData\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/View/View.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Parameter \\#3 \\$context \\(\'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null\\) of method CodeIgniter\\\\View\\\\View\\:\\:setVar\\(\\) should be contravariant with parameter \\$context \\(string\\|null\\) of method CodeIgniter\\\\View\\\\RendererInterface\\:\\:setVar\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/View/View.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#',
 	'count' => 2,

From e113ff1360b4d9b96921a0a150df667ce9ec8256 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Nov 2023 16:47:16 +0900
Subject: [PATCH 143/380] fix: Image::save() causes error with webp

imagewebp(): Palette image not supported by webp
---
 system/Images/Handlers/GDHandler.php  |   1 +
 tests/_support/Images/rocket.png      | Bin 0 -> 56947 bytes
 tests/system/Images/GDHandlerTest.php |   9 +++++++++
 3 files changed, 10 insertions(+)
 create mode 100644 tests/_support/Images/rocket.png

diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index 15bb97b6b839..6620dcac431a 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -227,6 +227,7 @@ public function save(?string $target = null, int $quality = 90): bool
 
         // for png and webp we can actually preserve transparency
         if (in_array($this->image()->imageType, $this->supportTransparency, true)) {
+            imagepalettetotruecolor($this->resource);
             imagealphablending($this->resource, false);
             imagesavealpha($this->resource, true);
         }
diff --git a/tests/_support/Images/rocket.png b/tests/_support/Images/rocket.png
new file mode 100644
index 0000000000000000000000000000000000000000..07ca8e212637901c2f4f1f430721047408607cf8
GIT binary patch
literal 56947
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

literal 0
HcmV?d00001

diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index b605c54a5c9c..c6fce3e37290 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -412,6 +412,15 @@ public function testImageConvert(): void
         $this->assertSame(exif_imagetype($this->start . 'work/ci-logo.png'), IMAGETYPE_PNG);
     }
 
+    public function testImageConvertPngToWebp(): void
+    {
+        $this->handler->withFile($this->origin . 'rocket.png');
+        $this->handler->convert(IMAGETYPE_WEBP);
+        $saved = $this->start . 'work/rocket.webp';
+        $this->handler->save($saved);
+        $this->assertSame(exif_imagetype($saved), IMAGETYPE_WEBP);
+    }
+
     public function testImageReorientLandscape(): void
     {
         for ($i = 0; $i <= 8; $i++) {

From d45dd5948f8a2d85136eddd6d5251f23cc18e838 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Nov 2023 17:53:37 +0900
Subject: [PATCH 144/380] docs: change phpstan-type names

---
 system/Config/View.php | 12 ++++++------
 system/View/Parser.php |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/system/Config/View.php b/system/Config/View.php
index 5a6a6404b69e..101b67f580d0 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -16,8 +16,8 @@
 /**
  * View configuration
  *
- * @phpstan-type ParserCallable (callable(mixed): mixed)
- * @phpstan-type ParserCallableString (callable(mixed): mixed)&string
+ * @phpstan-type parser_callable (callable(mixed): mixed)
+ * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
  */
 class View extends BaseConfig
 {
@@ -40,7 +40,7 @@ class View extends BaseConfig
      * @psalm-suppress UndefinedDocblockClass
      *
      * @var array<string, string>
-     * @phpstan-var array<string, ParserCallableString>
+     * @phpstan-var array<string, parser_callable_string>
      */
     public $filters = [];
 
@@ -52,7 +52,7 @@ class View extends BaseConfig
      * @psalm-suppress UndefinedDocblockClass
      *
      * @var array<string, array<string>|callable|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
      */
     public $plugins = [];
 
@@ -60,7 +60,7 @@ class View extends BaseConfig
      * Built-in View filters.
      *
      * @var array<string, string>
-     * @phpstan-var array<string, ParserCallableString>
+     * @phpstan-var array<string, parser_callable_string>
      */
     protected $coreFilters = [
         'abs'            => '\abs',
@@ -90,7 +90,7 @@ class View extends BaseConfig
      * Built-in View plugins.
      *
      * @var array<string, array<string>|callable|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
      */
     protected $corePlugins = [
         'csp_script_nonce'  => '\CodeIgniter\View\Plugins::cspScriptNonce',
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 120570079d2b..ff729d4837d5 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -20,8 +20,8 @@
 /**
  * Class for parsing pseudo-vars
  *
- * @phpstan-type ParserCallable (callable(mixed): mixed)
- * @phpstan-type ParserCallableString (callable(mixed): mixed)&string
+ * @phpstan-type parser_callable (callable(mixed): mixed)
+ * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
  *
  * @see \CodeIgniter\View\ParserTest
  */
@@ -64,7 +64,7 @@ class Parser extends View
      * Stores any plugins registered at run-time.
      *
      * @var array<string, array<string>|callable|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
      */
     protected $plugins = [];
 

From 5dccbcc87017b3207e4935c5b786bca3b5f5c45b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Nov 2023 19:01:21 +0900
Subject: [PATCH 145/380] chore: vendor/bin/psalm
 --set-baseline=psalm-baseline.xml

---
 psalm-baseline.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 379314e5093a..c4240e2b7fc8 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -10,11 +10,6 @@
       <code>public $plugins = [];</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="system/Cache/FactoriesCache/FileVarExportHandler.php">
-    <UndefinedVariable>
-      <code>$val</code>
-    </UndefinedVariable>
-  </file>
   <file src="system/Cache/Handlers/MemcachedHandler.php">
     <UndefinedClass>
       <code>Memcache</code>
@@ -39,9 +34,9 @@
   </file>
   <file src="system/Config/View.php">
     <UndefinedDocblockClass>
-      <code><![CDATA[array<string, ParserCallableString>]]></code>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
+      <code><![CDATA[array<string, parser_callable_string>]]></code>
       <code><![CDATA[protected $coreFilters = [
         'abs'            => '\abs',
         'capitalize'     => '\CodeIgniter\View\Filters::capitalize',
@@ -144,8 +139,8 @@
   </file>
   <file src="system/View/Parser.php">
     <UndefinedDocblockClass>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
       <code>protected $plugins = [];</code>
       <code>protected $plugins = [];</code>
     </UndefinedDocblockClass>

From 0d277665e6dca03a818d3fc6eed31a91a055cda8 Mon Sep 17 00:00:00 2001
From: Thomas Meschke <thomas.meschke@googlemail.com>
Date: Tue, 14 Nov 2023 11:24:56 +0100
Subject: [PATCH 146/380] replace -1 with E_ALL in error_reporting calls

---
 app/Config/Boot/development.php | 2 +-
 app/Config/Boot/testing.php     | 2 +-
 spark                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php
index aa8099a46501..a868447a8e37 100644
--- a/app/Config/Boot/development.php
+++ b/app/Config/Boot/development.php
@@ -10,7 +10,7 @@
  |
  | If you set 'display_errors' to '1', CI4's detailed error report will show.
  */
-error_reporting(-1);
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /*
diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php
index e84670e972f6..40b6ca83cf3f 100644
--- a/app/Config/Boot/testing.php
+++ b/app/Config/Boot/testing.php
@@ -14,7 +14,7 @@
  | make sure they don't make it to production. And save us hours of
  | painful debugging.
  */
-error_reporting(-1);
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /*
diff --git a/spark b/spark
index 2ea79d5ccdaf..9daa44034473 100755
--- a/spark
+++ b/spark
@@ -39,7 +39,7 @@ if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
 }
 
 // We want errors to be shown when using it from the CLI.
-error_reporting(-1);
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /**

From f364cb8a5a0ad7f9a146fbd8174f13edb942ce6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:06:55 +0000
Subject: [PATCH 147/380] chore(deps): bump actions/github-script from 6 to 7

Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy-distributables.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-distributables.yml b/.github/workflows/deploy-distributables.yml
index 3d4b31f289e6..f28a62544fa5 100644
--- a/.github/workflows/deploy-distributables.yml
+++ b/.github/workflows/deploy-distributables.yml
@@ -66,7 +66,7 @@ jobs:
         run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -116,7 +116,7 @@ jobs:
         run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -172,7 +172,7 @@ jobs:
         run: ./source/.github/scripts/deploy-userguide ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/userguide ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |

From ee5d2a344aefc90943e4f4bdcb4663a5ea113548 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:36:32 +0000
Subject: [PATCH 148/380] chore(deps-dev): update rector/rector requirement
 from 0.18.7 to 0.18.8

Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](https://github.com/rectorphp/rector/compare/0.18.7...0.18.8)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7f00c4c6efa0..d762dea8e0bb 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.7",
+        "rector/rector": "0.18.8",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

From 535405241324aa387fcce24bee6e993f77f08156 Mon Sep 17 00:00:00 2001
From: Cole Thorsen <959538+colethorsen@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:47:14 -0800
Subject: [PATCH 149/380] fix issue where running getClassName on a directory
 would cause a PHP error

---
 system/Autoloader/FileLocator.php           | 4 ++++
 tests/system/Autoloader/FileLocatorTest.php | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 744567a3bcc0..7cd2a5e60135 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -119,6 +119,10 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
      */
     public function getClassname(string $file): string
     {
+        if(is_dir($file)) {
+            return '';
+        }
+
         $php       = file_get_contents($file);
         $tokens    = token_get_all($php);
         $dlm       = false;
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 1cf32cfa5ad1..8df13094ef7a 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -312,4 +312,12 @@ public function testGetClassNameFromNonClassFile(): void
             $this->locator->getClassname(SYSTEMPATH . 'bootstrap.php')
         );
     }
+
+    public function testGetClassNameFromDirectory(): void
+    {
+        $this->assertSame(
+            '',
+            $this->locator->getClassname(SYSTEMPATH)
+        );
+    }
 }

From b53f049553ccfa88e6c63cb3d3b526e447583663 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Nov 2023 19:02:33 +0900
Subject: [PATCH 150/380] docs: add types for PHPStan

---
 system/BaseModel.php | 11 +++++++++++
 system/Model.php     | 11 ++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index e8e746e64c25..f9eed92b1d49 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -41,6 +41,16 @@
  *      - ensure validation is run against objects when saving items
  *      - process various callbacks
  *      - allow intermingling calls to the db connection
+ *
+ * @phpstan-type row_array array<int|string, float|int|null|string>
+ * @phpstan-type event_data_beforeinsert array{data: row_array}
+ * @phpstan-type event_data_afterinsert array{id: int|string, data: row_array, result: bool}
+ * @phpstan-type event_data_beforefind array{id?: int|string, method: string, singleton: bool, limit?: int, offset?: int}
+ * @phpstan-type event_data_afterfind array{id: int|string|null|list<int|string>, data: row_array|list<row_array>|object|null, method: string, singleton: bool}
+ * @phpstan-type event_data_beforeupdate array{id: null|list<int|string>, data: row_array}
+ * @phpstan-type event_data_afterupdate array{id: null|list<int|string>, data: row_array|object, result: bool}
+ * @phpstan-type event_data_beforedelete array{id: null|list<int|string>, purge: bool}
+ * @phpstan-type event_data_afterdelete array{id: null|list<int|string>, data: null, purge: bool, result: bool}
  */
 abstract class BaseModel
 {
@@ -539,6 +549,7 @@ abstract public function chunk(int $size, Closure $userFunc);
      * @param array|int|string|null $id One primary key or an array of primary keys
      *
      * @return array|object|null The resulting row of data, or null.
+     * @phpstan-return ($id is int|string ? row_array|object|null : list<row_array|object>)
      */
     public function find($id = null)
     {
diff --git a/system/Model.php b/system/Model.php
index 1873804a3c2d..d2f531998fef 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -84,6 +84,8 @@
  * @method $this where($key, $value = null, ?bool $escape = null)
  * @method $this whereIn(?string $key = null, $values = null, ?bool $escape = null)
  * @method $this whereNotIn(?string $key = null, $values = null, ?bool $escape = null)
+ *
+ * @phpstan-import-type row_array from BaseModel
  */
 class Model extends BaseModel
 {
@@ -178,6 +180,7 @@ public function setTable(string $table)
      * @param array|int|string|null $id        One primary key or an array of primary keys
      *
      * @return array|object|null The resulting row of data, or null.
+     * @phpstan-return ($singleton is true ? row_array|null|object : list<row_array|object>)
      */
     protected function doFind(bool $singleton, $id = null)
     {
@@ -224,6 +227,7 @@ protected function doFindColumn(string $columnName)
      * @param int $offset Offset
      *
      * @return array
+     * @phpstan-return list<row_array|object>
      */
     protected function doFindAll(int $limit = 0, int $offset = 0)
     {
@@ -244,6 +248,7 @@ protected function doFindAll(int $limit = 0, int $offset = 0)
      * This method works only with dbCalls.
      *
      * @return array|object|null
+     * @phpstan-return row_array|object|null
      */
     protected function doFirst()
     {
@@ -411,7 +416,7 @@ protected function doUpdateBatch(?array $set = null, ?string $index = null, int
      * @param array|int|string|null $id    The rows primary key(s)
      * @param bool                  $purge Allows overriding the soft deletes setting.
      *
-     * @return bool|string
+     * @return bool|string SQL string when testMode
      *
      * @throws DatabaseException
      */
@@ -450,7 +455,7 @@ protected function doDelete($id = null, bool $purge = false)
      * through soft deletes (deleted = 1)
      * This method works only with dbCalls.
      *
-     * @return bool|string Returns a string if in test mode.
+     * @return bool|string Returns a SQL string if in test mode.
      */
     protected function doPurgeDeleted()
     {
@@ -491,7 +496,7 @@ protected function doReplace(?array $data = null, bool $returnSQL = false)
      *  ['source' => 'message']
      * This method works only with dbCalls.
      *
-     * @return array<string,string>
+     * @return array<string, string>
      */
     protected function doErrors()
     {

From 76757983726bb457c2df92581a025ea22797c261 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Nov 2023 19:03:12 +0900
Subject: [PATCH 151/380] docs: update PHPDoc types

---
 system/Database/BaseBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 12bd14f73ab1..badf2d35cdfc 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2738,9 +2738,9 @@ public function getCompiledDelete(bool $reset = true): string
     /**
      * Compiles a delete string and runs the query
      *
-     * @param mixed $where
+     * @param array|RawSql|string $where
      *
-     * @return bool|string Returns a string if in test mode.
+     * @return bool|string Returns a SQL string if in test mode.
      *
      * @throws DatabaseException
      */

From 279e1358fdbed35192c53b9d6d52739b63699374 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Nov 2023 09:24:47 +0900
Subject: [PATCH 152/380] docs: make note stand out

---
 user_guide_src/source/libraries/validation.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index df48ce2ed55b..ff449c9e6fb9 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -978,7 +978,13 @@ valid_cc_number         Yes        Verifies that the credit card number matches
 Rules for File Uploads
 ======================
 
-These validation rules enable you to do the basic checks you might need to verify that uploaded files meet your business needs.
+When you validate uploaded files, you must use the rules specifically created for
+file validation.
+
+.. important:: Only rules that listed in the table below can be used to validate
+    files. Therefore, adding any general rules, like ``permit_empty``, to file
+    validation rules array or string, the file validation will not work correctly.
+
 Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global, the name of the input field will
 need to be used twice. Once to specify the field name as you would for any other rule, but again as the first parameter of all
 file upload related rules::
@@ -1020,7 +1026,3 @@ is_image                Yes         Fails if the file cannot be determined to be
 ======================= ========== ============================================= ===================================================
 
 The file validation rules apply for both single and multiple file uploads.
-
-.. note:: Only rules specifically created for file validation (like the ones listed in the table above) can be used to validate files.
-    Therefore, adding any general rules, like ``permit_empty``, to file validation rules array or string, the file validation will not
-    work correctly.

From f5135041c57be0dd326357edf8fba971719c32f7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Nov 2023 10:09:43 +0900
Subject: [PATCH 153/380] chore: use MySQL 8.0 by default

---
 .github/workflows/test-phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index c6deb546bb7d..f0cc346617f6 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -99,11 +99,11 @@ jobs:
           - SQLSRV
           - SQLite3
         mysql-version:
-          - '5.7'
+          - '8.0'
         include:
           - php-version: '7.4'
             db-platform: MySQLi
-            mysql-version: '8.0'
+            mysql-version: '5.7'
           - php-version: '8.3'
             composer-option: '--ignore-platform-req=php'
 

From 7d758d8522f595cc84fae5cc209b504536444595 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Nov 2023 10:10:00 +0900
Subject: [PATCH 154/380] chore: set empty string as name

It should be boolean/number/string
---
 .github/workflows/test-phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index f0cc346617f6..53124f695162 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -109,7 +109,7 @@ jobs:
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
-      job-name:
+      job-name: ''
       php-version: ${{ matrix.php-version }}
       job-id: database-live-tests
       db-platform: ${{ matrix.db-platform }}
@@ -141,7 +141,7 @@ jobs:
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
-      job-name:
+      job-name: ''
       php-version: ${{ matrix.php-version }}
       job-id: separate-process-tests
       group-name: SeparateProcess

From 3ba7ef65cd6d1b5dca7b97bc1b93d95a4139c9ab Mon Sep 17 00:00:00 2001
From: Cole Thorsen <959538+colethorsen@users.noreply.github.com>
Date: Wed, 15 Nov 2023 07:51:19 -0800
Subject: [PATCH 155/380] fix style

---
 system/Autoloader/FileLocator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 7cd2a5e60135..92381a7ee25b 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -119,7 +119,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
      */
     public function getClassname(string $file): string
     {
-        if(is_dir($file)) {
+        if (is_dir($file)) {
             return '';
         }
 

From eafda29a27553a821c5625c1ca12432d28fdbadc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 08:35:38 +0900
Subject: [PATCH 156/380] docs: add note for migrations table

---
 user_guide_src/source/dbmgmt/migration.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 4af207164b73..fd816e551c02 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -66,7 +66,7 @@ Database Groups
 ===============
 
 A migration will only be run against a single database group. If you have multiple groups defined in
-**app/Config/Database.php**, then it will run against the ``$defaultGroup`` as specified
+**app/Config/Database.php**, then by default it will run against the ``$defaultGroup`` as specified
 in that same configuration file.
 
 There may be times when you need different schemas for different
@@ -79,6 +79,9 @@ match the name of the database group exactly:
 
 .. literalinclude:: migration/003.php
 
+.. note:: The **migrations** table that tracks which migrations have already been
+    run will be always created in the default database group.
+
 Namespaces
 ==========
 

From 0b47dfea28cbaf8e09ebc3cb31e5346d119242bc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 08:45:15 +0900
Subject: [PATCH 157/380] docs: clarify that $db is for testing purposes

---
 system/Database/MigrationRunner.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 241a9e6da5fa..a466a91462dc 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -122,14 +122,11 @@ class MigrationRunner
     protected $groupSkip = false;
 
     /**
-     * Constructor.
+     * The migration can manage multiple databases. So it should always use the
+     * default DB group so that it creates the `migrations` table in the default
+     * DB group. Therefore, passing $db is for testing purposes only.
      *
-     * When passing in $db, you may pass any of the following to connect:
-     * - group name
-     * - existing connection instance
-     * - array of database configuration values
-     *
-     * @param array|ConnectionInterface|string|null $db
+     * @param array|ConnectionInterface|string|null $db DB group. For testing purposes only.
      *
      * @throws ConfigException
      */

From 0f9b27b57d4a4a560719486f850ff1653e2ce64b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 09:09:33 +0900
Subject: [PATCH 158/380] docs: update outdated sample code

---
 user_guide_src/source/helpers/filesystem_helper/010.php | 2 +-
 user_guide_src/source/helpers/filesystem_helper/011.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/helpers/filesystem_helper/010.php b/user_guide_src/source/helpers/filesystem_helper/010.php
index 51db194b6d63..3b88fda2a77b 100644
--- a/user_guide_src/source/helpers/filesystem_helper/010.php
+++ b/user_guide_src/source/helpers/filesystem_helper/010.php
@@ -1,3 +1,3 @@
 <?php
 
-$controllers = get_filenames(APPPATH . 'controllers/');
+$controllers = get_filenames(APPPATH . 'Controllers/');
diff --git a/user_guide_src/source/helpers/filesystem_helper/011.php b/user_guide_src/source/helpers/filesystem_helper/011.php
index 61ae0fd853f9..55404934065e 100644
--- a/user_guide_src/source/helpers/filesystem_helper/011.php
+++ b/user_guide_src/source/helpers/filesystem_helper/011.php
@@ -1,3 +1,3 @@
 <?php
 
-$models_info = get_dir_file_info(APPPATH . 'models/');
+$models_info = get_dir_file_info(APPPATH . 'Models/');

From a28cadd06b9629b953653db4bf20db4cbee5403a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 09:28:41 +0900
Subject: [PATCH 159/380] docs: update outdated description

---
 user_guide_src/source/helpers/filesystem_helper.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 75062ae054a3..eb70a3cc5406 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -2,8 +2,8 @@
 Filesystem Helper
 #################
 
-The Directory Helper file contains functions that assist in working with
-directories.
+The Filesystem Helper file contains functions that assist in working with
+files and directories.
 
 .. contents::
     :local:

From 0304689e95c3ac4dbc1d95b1b2942b3b9f07f7d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 09:29:01 +0900
Subject: [PATCH 160/380] docs: fix incorrect parameter in sample code

---
 user_guide_src/source/helpers/filesystem_helper/004.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/helpers/filesystem_helper/004.php b/user_guide_src/source/helpers/filesystem_helper/004.php
index 6b1e065cc0a5..418ecd7640fc 100644
--- a/user_guide_src/source/helpers/filesystem_helper/004.php
+++ b/user_guide_src/source/helpers/filesystem_helper/004.php
@@ -1,3 +1,3 @@
 <?php
 
-$map = directory_map('./mydirectory/', false, true);
+$map = directory_map('./mydirectory/', 0, true);

From ba7a19514161035a66426ee982026eae04b123d9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 09:30:09 +0900
Subject: [PATCH 161/380] docs: add text decration

---
 .../source/helpers/filesystem_helper.rst         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index eb70a3cc5406..728ce3997cd2 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -24,7 +24,7 @@ The following functions are available:
 .. php:function:: directory_map($sourceDir[, $directoryDepth = 0[, $hidden = false]])
 
     :param    string  $sourceDir: Path to the source directory
-    :param    int   $directoryDepth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
+    :param    int   $directoryDepth: Depth of directories to traverse (``0`` = fully recursive, ``1`` = current dir, etc)
     :param    bool    $hidden: Whether to include hidden paths
     :returns:    An array of files
     :rtype:    array
@@ -33,17 +33,17 @@ The following functions are available:
 
     .. literalinclude:: filesystem_helper/002.php
 
-    .. note:: Paths are almost always relative to your main index.php file.
+    .. note:: Paths are almost always relative to your main **index.php** file.
 
     Sub-folders contained within the directory will be mapped as well. If
     you wish to control the recursion depth, you can do so using the second
-    parameter (integer). A depth of 1 will only map the top level directory:
+    parameter (integer). A depth of ``1`` will only map the top level directory:
 
     .. literalinclude:: filesystem_helper/003.php
 
     By default, hidden files will not be included in the returned array and
     hidden directories will be skipped. To override this behavior, you may
-    set a third parameter to true (boolean):
+    set a third parameter to ``true`` (boolean):
 
     .. literalinclude:: filesystem_helper/004.php
 
@@ -99,7 +99,7 @@ The following functions are available:
     :param    string    $path: File path
     :param    string    $data: Data to write to file
     :param    string    $mode: ``fopen()`` mode
-    :returns:    true if the write was successful, false in case of an error
+    :returns:    ``true`` if the write was successful, ``false`` in case of an error
     :rtype:    bool
 
     Writes data to the file specified in the path. If the file does not exist then the
@@ -120,7 +120,7 @@ The following functions are available:
         be set such that it is writable. If the file does not already exist,
         then the directory containing it must be writable.
 
-    .. note:: The path is relative to your main site index.php file, NOT your
+    .. note:: The path is relative to your main site **index.php** file, NOT your
         controller or view files. CodeIgniter uses a front controller so paths
         are always relative to the main site index.
 
@@ -132,7 +132,7 @@ The following functions are available:
     :param    bool    $delDir: Whether to also delete directories
     :param    bool    $htdocs: Whether to skip deleting .htaccess and index page files
     :param  bool    $hidden: Whether to also delete hidden files (files beginning with a period)
-    :returns:    true on success, false in case of an error
+    :returns:    ``true`` on success, ``false`` in case of an error
     :rtype:    bool
 
     Deletes ALL files contained in the supplied path.
@@ -141,7 +141,7 @@ The following functions are available:
 
     .. literalinclude:: filesystem_helper/008.php
 
-    If the second parameter is set to true, any directories contained within the supplied
+    If the second parameter is set to ``true``, any directories contained within the supplied
     root path will be deleted as well.
 
     Example:

From 4ed2bfe33b8eed5ad7e1b1937fb03538aed273ef Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 09:30:34 +0900
Subject: [PATCH 162/380] docs: add links to PHP manual

---
 user_guide_src/source/helpers/filesystem_helper.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 728ce3997cd2..99230f2d4c94 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -204,7 +204,7 @@ The following functions are available:
     :returns:    Symbolic permissions string
     :rtype:    string
 
-    Takes numeric permissions (such as is returned by ``fileperms()``) and returns
+    Takes numeric permissions (such as is returned by `fileperms() <https://www.php.net/manual/en/function.fileperms.php>`_) and returns
     standard symbolic notation of file permissions.
 
     .. literalinclude:: filesystem_helper/012.php
@@ -215,7 +215,7 @@ The following functions are available:
     :returns:    Octal permissions string
     :rtype:    string
 
-    Takes numeric permissions (such as is returned by ``fileperms()``) and returns
+    Takes numeric permissions (such as is returned by `fileperms() <https://www.php.net/manual/en/function.fileperms.php>`_) and returns
     a three character octal notation of file permissions.
 
     .. literalinclude:: filesystem_helper/013.php

From fd07f4fa870c3eba07989415f7aee4a7f815e274 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Nov 2023 09:30:50 +0900
Subject: [PATCH 163/380] docs: change anchor text

---
 user_guide_src/source/helpers/filesystem_helper.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 99230f2d4c94..e122660959c5 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -113,7 +113,7 @@ The following functions are available:
 
     .. literalinclude:: filesystem_helper/007.php
 
-    The default mode is 'wb'. Please see the `PHP user guide <https://www.php.net/manual/en/function.fopen.php>`_
+    The default mode is ``'wb'``. Please see `fopen() <https://www.php.net/manual/en/function.fopen.php>`_ in the PHP manual
     for mode options.
 
     .. note:: In order for this function to write data to a file, its permissions must

From d4fc50d35f3c470637829095ad76e75f137047fd Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 17 Nov 2023 00:50:53 +0700
Subject: [PATCH 164/380] Remove unused use statements on system/Common.php

---
 system/Common.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 451e6c601a63..56e1c07b6e3e 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -25,9 +25,7 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\HTTP\URI;
 use CodeIgniter\Model;
 use CodeIgniter\Session\Session;
 use CodeIgniter\Test\TestLogger;

From 001339b291264d4a910c304c9b6e791c9dbddba7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:50:49 +0000
Subject: [PATCH 165/380] chore(deps-dev): update rector/rector requirement
 from 0.18.8 to 0.18.10

Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](https://github.com/rectorphp/rector/compare/0.18.8...0.18.10)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d762dea8e0bb..4ff56944a3b1 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.8",
+        "rector/rector": "0.18.10",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

From c6aa4426a8b6bcf651d4f6c544ccb2794fab7dfe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 07:05:37 +0900
Subject: [PATCH 166/380] docs: fix incorrect code

---
 user_guide_src/source/database/results/013.php | 2 +-
 user_guide_src/source/database/results/014.php | 2 +-
 user_guide_src/source/database/results/015.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/database/results/013.php b/user_guide_src/source/database/results/013.php
index d0b1e445f01f..bb476f84eb80 100644
--- a/user_guide_src/source/database/results/013.php
+++ b/user_guide_src/source/database/results/013.php
@@ -6,7 +6,7 @@ class User
     public $email;
     public $username;
 
-    protected $last_login;
+    protected $lastLogin;
 
     public function lastLogin($format)
     {
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
index f0845bf55ac3..fe88c6f0529e 100644
--- a/user_guide_src/source/database/results/014.php
+++ b/user_guide_src/source/database/results/014.php
@@ -7,5 +7,5 @@
 foreach ($rows as $row) {
     echo $row->id;
     echo $row->email;
-    echo $row->last_login('Y-m-d');
+    echo $row->lastLogin('Y-m-d');
 }
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 247d5d8b5313..31bc816a8472 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -6,5 +6,5 @@
 
 if (isset($row)) {
     echo $row->email;               // access attributes
-    echo $row->last_login('Y-m-d'); // access class methods
+    echo $row->lastLogin('Y-m-d'); // access class methods
 }

From 745381c8393a3e41bcd3e97da2a75d533dfa8d2e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 07:06:33 +0900
Subject: [PATCH 167/380] docs: add namespace to User class

---
 user_guide_src/source/database/results/003.php | 4 ++--
 user_guide_src/source/database/results/007.php | 2 +-
 user_guide_src/source/database/results/013.php | 2 ++
 user_guide_src/source/database/results/014.php | 2 +-
 user_guide_src/source/database/results/015.php | 2 +-
 user_guide_src/source/database/results/016.php | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/database/results/003.php b/user_guide_src/source/database/results/003.php
index da55c19717c1..d3fc78cc8d77 100644
--- a/user_guide_src/source/database/results/003.php
+++ b/user_guide_src/source/database/results/003.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('SELECT * FROM users;');
 
-foreach ($query->getResult('User') as $user) {
-    echo $user->name; // access attributes
+foreach ($query->getResult(\App\Entities\User::class) as $user) {
+    echo $user->name;          // access attributes
     echo $user->reverseName(); // or methods defined on the 'User' class
 }
diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
index 6a6c309efb4f..460857242adb 100644
--- a/user_guide_src/source/database/results/007.php
+++ b/user_guide_src/source/database/results/007.php
@@ -1,7 +1,7 @@
 <?php
 
 $query = $db->query('SELECT * FROM users LIMIT 1;');
-$row   = $query->getRow(0, 'User');
+$row   = $query->getRow(0, \App\Entities\User::class);
 
 echo $row->name; // access attributes
 echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/013.php b/user_guide_src/source/database/results/013.php
index bb476f84eb80..baef2cd97d99 100644
--- a/user_guide_src/source/database/results/013.php
+++ b/user_guide_src/source/database/results/013.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Entities;
+
 class User
 {
     public $id;
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
index fe88c6f0529e..1ee5af841a25 100644
--- a/user_guide_src/source/database/results/014.php
+++ b/user_guide_src/source/database/results/014.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$rows = $query->getCustomResultObject('User');
+$rows = $query->getCustomResultObject(\App\Entities\User::class);
 
 foreach ($rows as $row) {
     echo $row->id;
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 31bc816a8472..7fff4e037bf4 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$row = $query->getCustomRowObject(0, 'User');
+$row = $query->getCustomRowObject(0, \App\Entities\User::class);
 
 if (isset($row)) {
     echo $row->email;               // access attributes
diff --git a/user_guide_src/source/database/results/016.php b/user_guide_src/source/database/results/016.php
index ed5ac68c4b1a..f6d0e2325ce6 100644
--- a/user_guide_src/source/database/results/016.php
+++ b/user_guide_src/source/database/results/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$row = $query->getCustomRowObject(0, 'User');
+$row = $query->getCustomRowObject(0, \App\Entities\User::class);

From 63fc2c04c9cfea49d13aa7b3de8fd95f5c4e204c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 07:06:54 +0900
Subject: [PATCH 168/380] docs: align comments

---
 user_guide_src/source/database/results/007.php | 2 +-
 user_guide_src/source/database/results/015.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
index 460857242adb..ed1550836aab 100644
--- a/user_guide_src/source/database/results/007.php
+++ b/user_guide_src/source/database/results/007.php
@@ -3,5 +3,5 @@
 $query = $db->query('SELECT * FROM users LIMIT 1;');
 $row   = $query->getRow(0, \App\Entities\User::class);
 
-echo $row->name; // access attributes
+echo $row->name;           // access attributes
 echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 7fff4e037bf4..7cc9b7996e3b 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -5,6 +5,6 @@
 $row = $query->getCustomRowObject(0, \App\Entities\User::class);
 
 if (isset($row)) {
-    echo $row->email;               // access attributes
+    echo $row->email;              // access attributes
     echo $row->lastLogin('Y-m-d'); // access class methods
 }

From 247e7407a05c8e57c67d41d4861ec006b52088e5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 08:53:01 +0900
Subject: [PATCH 169/380] docs: change sample code to be more practical

---
 user_guide_src/source/database/events.rst     |  4 +++-
 user_guide_src/source/database/events/001.php | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/events.rst b/user_guide_src/source/database/events.rst
index 08fe73b09081..8cefcad22dbf 100644
--- a/user_guide_src/source/database/events.rst
+++ b/user_guide_src/source/database/events.rst
@@ -21,6 +21,8 @@ DBQuery
 This event is triggered whenever a new query has been run, whether successful or not. The only parameter is
 a :doc:`Query </database/queries>` instance of the current query. You could use this to display all queries
 in STDOUT, or logging to a file, or even creating tools to do automatic query analysis to help you spot
-potentially missing indexes, slow queries, etc. An example usage might be:
+potentially missing indexes, slow queries, etc.
+
+An example usage might be:
 
 .. literalinclude:: events/001.php
diff --git a/user_guide_src/source/database/events/001.php b/user_guide_src/source/database/events/001.php
index 4461b715af19..ed2bb1fcec43 100644
--- a/user_guide_src/source/database/events/001.php
+++ b/user_guide_src/source/database/events/001.php
@@ -1,4 +1,18 @@
 <?php
 
 // In app/Config/Events.php
-Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+
+namespace Config;
+
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\HotReloader\HotReloader;
+
+// ...
+
+Events::on(
+    'DBQuery',
+    static function (\CodeIgniter\Database\Query $query) {
+        log_message('info', (string) $query);
+    }
+);

From 13416bb6e9e19aeb227c143fdb7f227d74eec047 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Nov 2023 09:05:23 +0900
Subject: [PATCH 170/380] test: fix failed test

---
 tests/system/Validation/ValidationTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 85b504ca1cd7..889338a09f41 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -797,7 +797,7 @@ public function testJsonInputInvalid(): void
 
         $config  = new App();
         $json    = 'invalid';
-        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+        $request = new IncomingRequest($config, new SiteURI($config), $json, new UserAgent());
         $request->setHeader('Content-Type', 'application/json');
 
         $rules = [

From 7c0024a10002b3d0532ea4a03ac8a6cf5a49c06e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Nov 2023 09:42:07 +0900
Subject: [PATCH 171/380] docs: add space after comma

---
 app/Config/Publisher.php    | 2 +-
 system/Config/Publisher.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
index 47475112c080..bf03be1db7e0 100644
--- a/app/Config/Publisher.php
+++ b/app/Config/Publisher.php
@@ -19,7 +19,7 @@ class Publisher extends BasePublisher
      * result in a PublisherException. Files that do no fit the
      * pattern will cause copy/merge to fail.
      *
-     * @var array<string,string>
+     * @var array<string, string>
      */
     public $restrictions = [
         ROOTPATH => '*',
diff --git a/system/Config/Publisher.php b/system/Config/Publisher.php
index fa04e24cd28f..d5f938e09be3 100644
--- a/system/Config/Publisher.php
+++ b/system/Config/Publisher.php
@@ -26,7 +26,7 @@ class Publisher extends BaseConfig
      * result in a PublisherException. Files that do no fit the
      * pattern will cause copy/merge to fail.
      *
-     * @var array<string,string>
+     * @var array<string, string>
      */
     public $restrictions = [
         ROOTPATH => '*',

From ad6e3e141b6201788cce9b0d351411bf47e19669 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Nov 2023 09:42:30 +0900
Subject: [PATCH 172/380] config: update system/Config/Routing

This should be the same as Config\Routing.
---
 system/Config/Routing.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/system/Config/Routing.php b/system/Config/Routing.php
index 409bcf099f65..e6d25138f8f0 100644
--- a/system/Config/Routing.php
+++ b/system/Config/Routing.php
@@ -24,7 +24,7 @@ class Routing extends BaseConfig
      * Default: APPPATH . 'Config/Routes.php'
      */
     public array $routeFiles = [
-        APPPATH . 'Routes.php',
+        APPPATH . 'Config/Routes.php',
     ];
 
     /**
@@ -95,4 +95,17 @@ class Routing extends BaseConfig
      * Default: false
      */
     public bool $prioritize = false;
+
+    /**
+     * Map of URI segments and namespaces. For Auto Routing (Improved).
+     *
+     * The key is the first URI segment. The value is the controller namespace.
+     * E.g.,
+     *   [
+     *       'blog' => 'Acme\Blog\Controllers',
+     *   ]
+     *
+     * @var array [ uri_segment => namespace ]
+     */
+    public array $moduleRoutes = [];
 }

From a841e1de3d1841ebb3ce0329b1392f4716ec9026 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 20 Nov 2023 09:21:39 +0900
Subject: [PATCH 173/380] refactor: rename param names

---
 system/HTTP/RequestTrait.php | 45 +++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 52ffa812a315..0acfbe184b43 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -35,10 +35,9 @@ trait RequestTrait
     protected $ipAddress = '';
 
     /**
-     * Stores values we've retrieved from
-     * PHP globals.
+     * Stores values we've retrieved from PHP globals.
      *
-     * @var array
+     * @var array{get?: array, post?: array, request?: array, cookie?: array, server?: array}
      */
     protected $globals = [];
 
@@ -213,13 +212,15 @@ public function getEnv($index = null, $filter = null, $flags = null)
     /**
      * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
      *
+     * @param string $name Supergrlobal name (lowercase)
+     * @phpstan-param 'get'|'post'|'request'|'cookie'|'server' $name
      * @param mixed $value
      *
      * @return $this
      */
-    public function setGlobal(string $method, $value)
+    public function setGlobal(string $name, $value)
     {
-        $this->globals[$method] = $value;
+        $this->globals[$name] = $value;
 
         return $this;
     }
@@ -234,19 +235,18 @@ public function setGlobal(string $method, $value)
      *
      * http://php.net/manual/en/filter.filters.sanitize.php
      *
-     * @param string            $method Input filter constant
+     * @param string $name Supergrlobal name (lowercase)
+     * @phpstan-param 'get'|'post'|'request'|'cookie'|'server' $name
      * @param array|string|null $index
      * @param int|null          $filter Filter constant
      * @param array|int|null    $flags  Options
      *
      * @return array|bool|float|int|object|string|null
      */
-    public function fetchGlobal(string $method, $index = null, ?int $filter = null, $flags = null)
+    public function fetchGlobal(string $name, $index = null, ?int $filter = null, $flags = null)
     {
-        $method = strtolower($method);
-
-        if (! isset($this->globals[$method])) {
-            $this->populateGlobals($method);
+        if (! isset($this->globals[$name])) {
+            $this->populateGlobals($name);
         }
 
         // Null filters cause null values to return.
@@ -257,9 +257,9 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
         if ($index === null) {
             $values = [];
 
-            foreach ($this->globals[$method] as $key => $value) {
+            foreach ($this->globals[$name] as $key => $value) {
                 $values[$key] = is_array($value)
-                    ? $this->fetchGlobal($method, $key, $filter, $flags)
+                    ? $this->fetchGlobal($name, $key, $filter, $flags)
                     : filter_var($value, $filter, $flags);
             }
 
@@ -271,7 +271,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
             $output = [];
 
             foreach ($index as $key) {
-                $output[$key] = $this->fetchGlobal($method, $key, $filter, $flags);
+                $output[$key] = $this->fetchGlobal($name, $key, $filter, $flags);
             }
 
             return $output;
@@ -279,7 +279,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
 
         // Does the index contain array notation?
         if (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
-            $value = $this->globals[$method];
+            $value = $this->globals[$name];
 
             for ($i = 0; $i < $count; $i++) {
                 $key = trim($matches[0][$i], '[]');
@@ -297,7 +297,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
         }
 
         if (! isset($value)) {
-            $value = $this->globals[$method][$index] ?? null;
+            $value = $this->globals[$name][$index] ?? null;
         }
 
         if (is_array($value)
@@ -326,20 +326,23 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
     }
 
     /**
-     * Saves a copy of the current state of one of several PHP globals
+     * Saves a copy of the current state of one of several PHP globals,
      * so we can retrieve them later.
      *
+     * @param string $name Supergrlobal name (lowercase)
+     * @phpstan-param 'get'|'post'|'request'|'cookie'|'server' $name
+     *
      * @return void
      */
-    protected function populateGlobals(string $method)
+    protected function populateGlobals(string $name)
     {
-        if (! isset($this->globals[$method])) {
-            $this->globals[$method] = [];
+        if (! isset($this->globals[$name])) {
+            $this->globals[$name] = [];
         }
 
         // Don't populate ENV as it might contain
         // sensitive data that we don't want to get logged.
-        switch ($method) {
+        switch ($name) {
             case 'get':
                 $this->globals['get'] = $_GET;
                 break;

From cbb096727367ce8a526d83a2948b679f0b609519 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 20 Nov 2023 09:33:23 +0900
Subject: [PATCH 174/380] docs: make Request::getEnv() deprecated

See https://github.com/codeigniter4/CodeIgniter4/commit/b0975ec5dba#diff-fb41662a8e01f56cacc449d12f5d386be73835879b2f49f452cb2aef8ac03466R441-R442
---
 system/HTTP/RequestTrait.php                       | 3 +++
 user_guide_src/source/changelogs/v4.4.4.rst        | 4 ++++
 user_guide_src/source/incoming/incomingrequest.rst | 3 +++
 user_guide_src/source/incoming/request.rst         | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 0acfbe184b43..01ff12c73ca4 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -203,9 +203,12 @@ public function getServer($index = null, $filter = null, $flags = null)
      * @param array|int|null    $flags
      *
      * @return mixed
+     *
+     * @deprecated 4.4.4 This method does not work from the beginning. Use `env()`.
      */
     public function getEnv($index = null, $filter = null, $flags = null)
     {
+        // @phpstan-ignore-next-line
         return $this->fetchGlobal('env', $index, $filter, $flags);
     }
 
diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index dfc862d62b62..aca70ba7874e 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -41,6 +41,10 @@ Changes
 Deprecations
 ************
 
+- **Request:** The :php:meth:`CodeIgniter\\HTTP\\Request::getEnv()` method is
+  deprecated. This method does not work from the beginning. Use :php:func:`env()`
+  instead.
+
 **********
 Bugs Fixed
 **********
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index c6db5b28fe4c..ba3f12a0a0ec 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -131,6 +131,9 @@ The ``getServer()`` method will pull from ``$_SERVER``.
 getEnv()
 --------
 
+.. deprecated:: 4.4.4 This method does not work from the beginning. Use
+    :php:func:`env()` instead.
+
 The ``getEnv()`` method will pull from ``$_ENV``.
 
 * ``$request->getEnv()``
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index d15da89ec14e..7c00380b9dc9 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -107,6 +107,9 @@ Class Reference
 
     .. php:method:: getEnv([$index = null[, $filter = null[, $flags = null]]])
 
+        .. deprecated:: 4.4.4 This method does not work from the beginning. Use
+            :php:func:`env()` instead.
+
         :param    mixed     $index: Value name
         :param    int       $filter: The type of filter to apply. A list of filters can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.php>`__.
         :param    int|array $flags: Flags to apply. A list of flags can be found in `PHP manual <https://www.php.net/manual/en/filter.filters.flags.php>`__.

From fe64ca018ecfbfac4a68af46777e67c8e0800fa9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 20 Nov 2023 12:06:43 +0900
Subject: [PATCH 175/380] docs: fix typo

Co-authored-by: John Paul E. Balandan, CPA <paulbalandan@gmail.com>
---
 system/HTTP/RequestTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 01ff12c73ca4..6db903ddacec 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -332,7 +332,7 @@ public function fetchGlobal(string $name, $index = null, ?int $filter = null, $f
      * Saves a copy of the current state of one of several PHP globals,
      * so we can retrieve them later.
      *
-     * @param string $name Supergrlobal name (lowercase)
+     * @param string $name Superglobal name (lowercase)
      * @phpstan-param 'get'|'post'|'request'|'cookie'|'server' $name
      *
      * @return void

From 5fbef683589f0e20e3be369d08f2c686f6dabe0f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Nov 2023 06:31:15 +0900
Subject: [PATCH 176/380] chore: disable RemoveVarTagFromClassConstantRector

If we want to write @var to constants, we can write.
---
 rector.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rector.php b/rector.php
index 747cd4ce8bbd..cfc84104456e 100644
--- a/rector.php
+++ b/rector.php
@@ -45,7 +45,6 @@
 use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
-use Utils\Rector\RemoveVarTagFromClassConstantRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -134,7 +133,6 @@
     $rectorConfig->rule(ChangeArrayPushToArrayAssignRector::class);
     $rectorConfig->rule(UnnecessaryTernaryExpressionRector::class);
     $rectorConfig->rule(RemoveErrorSuppressInTryCatchStmtsRector::class);
-    $rectorConfig->rule(RemoveVarTagFromClassConstantRector::class);
     $rectorConfig->rule(SimplifyRegexPatternRector::class);
     $rectorConfig->rule(FuncGetArgsToVariadicParamRector::class);
     $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);

From 2ec8ff5d9b79f435330db4a5bad0ba4bf41410f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Nov 2023 10:47:24 +0900
Subject: [PATCH 177/380] fix: bug where ExceptionHandler displays incorrect
 Exception classname

It showed the first Exception, but devs must catch the thrown Exception.
---
 app/Views/errors/cli/error_exception.php  | 17 +++++++++++++----
 app/Views/errors/html/error_exception.php | 23 +++++++++++++++++++++++
 system/Debug/BaseExceptionHandler.php     |  9 ++++++++-
 system/Debug/Exceptions.php               | 14 ++++++++------
 4 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
index f24e98fb9a49..98d83b0ed3a6 100644
--- a/app/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -3,17 +3,26 @@
 use CodeIgniter\CLI\CLI;
 
 // The main Exception
-CLI::newLine();
 CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
-CLI::newLine();
 CLI::write($message);
-CLI::newLine();
 CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
 CLI::newLine();
 
+$last = $exception;
+
+while ($prevException = $last->getPrevious()) {
+    $last = $prevException;
+
+    CLI::write('  Caused by:');
+    CLI::write('  [' . get_class($prevException) . ']', 'red');
+    CLI::write('  ' . $prevException->getMessage());
+    CLI::write('  at ' . CLI::color(clean_path($prevException->getFile()) . ':' . $prevException->getLine(), 'green'));
+    CLI::newLine();
+}
+
 // The backtrace
 if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) {
-    $backtraces = $exception->getTrace();
+    $backtraces = $last->getTrace();
 
     if ($backtraces) {
         CLI::write('Backtrace:', 'green');
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 1c094d728872..406b48ec6772 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -44,6 +44,29 @@
         <?php endif; ?>
     </div>
 
+    <div class="container">
+        <?php
+        $last = $exception;
+
+        while ($prevException = $last->getPrevious()) {
+            $last = $prevException;
+            ?>
+
+    <pre>
+    Caused by:
+    <?= esc(get_class($prevException)), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
+
+    <?= nl2br(esc($prevException->getMessage())) ?>
+    <a href="https://www.duckduckgo.com/?q=<?= urlencode(get_class($prevException) . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>"
+       rel="noreferrer" target="_blank">search &rarr;</a>
+    <?= esc(clean_path($prevException->getFile()) . ':' . $prevException->getLine()) ?>
+    </pre>
+
+        <?php
+        }
+        ?>
+    </div>
+
     <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
     <div class="container">
 
diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index 0330c53cf97c..8b67d2153f9f 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -67,7 +67,14 @@ abstract public function handle(
      */
     protected function collectVars(Throwable $exception, int $statusCode): array
     {
-        $trace = $exception->getTrace();
+        // Get the first exception.
+        $firstException = $exception;
+
+        while ($prevException = $firstException->getPrevious()) {
+            $firstException = $prevException;
+        }
+
+        $trace = $firstException->getTrace();
 
         if ($this->config->sensitiveDataInTrace !== []) {
             $trace = $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace);
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index a9887fba15ce..37b0376990de 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -136,11 +136,6 @@ public function exceptionHandler(Throwable $exception)
         $this->request  = Services::request();
         $this->response = Services::response();
 
-        // Get the first exception.
-        while ($prevException = $exception->getPrevious()) {
-            $exception = $prevException;
-        }
-
         if (method_exists($this->config, 'handler')) {
             // Use new ExceptionHandler
             $handler = $this->config->handler($statusCode, $exception);
@@ -325,7 +320,14 @@ protected function render(Throwable $exception, int $statusCode)
      */
     protected function collectVars(Throwable $exception, int $statusCode): array
     {
-        $trace = $exception->getTrace();
+        // Get the first exception.
+        $firstException = $exception;
+
+        while ($prevException = $firstException->getPrevious()) {
+            $firstException = $prevException;
+        }
+
+        $trace = $firstException->getTrace();
 
         if ($this->config->sensitiveDataInTrace !== []) {
             $trace = $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace);

From 6153d4dffcdbaffdb4e5fe8a1ef86418879c139d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Nov 2023 13:02:13 +0900
Subject: [PATCH 178/380] chore: remove RemoveVarTagFromClassConstantRector
 class

---
 .../RemoveVarTagFromClassConstantRector.php   | 82 -------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 utils/Rector/RemoveVarTagFromClassConstantRector.php

diff --git a/utils/Rector/RemoveVarTagFromClassConstantRector.php b/utils/Rector/RemoveVarTagFromClassConstantRector.php
deleted file mode 100644
index 2393516f508b..000000000000
--- a/utils/Rector/RemoveVarTagFromClassConstantRector.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of CodeIgniter 4 framework.
- *
- * (c) CodeIgniter Foundation <admin@codeigniter.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Utils\Rector;
-
-use PhpParser\Node;
-use PhpParser\Node\Stmt\ClassConst;
-use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
-use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\Comments\NodeDocBlock\DocBlockUpdater;
-use Rector\Core\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-
-final class RemoveVarTagFromClassConstantRector extends AbstractRector
-{
-    private PhpDocInfoFactory $phpDocInfoFactory;
-    private DocBlockUpdater $docBlockUpdater;
-
-    public function __construct(PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater)
-    {
-        $this->phpDocInfoFactory = $phpDocInfoFactory;
-        $this->docBlockUpdater   = $docBlockUpdater;
-    }
-
-    public function getRuleDefinition(): RuleDefinition
-    {
-        return new RuleDefinition('Remove @var tag from class constant', [
-            new CodeSample(
-                <<<'CODE_SAMPLE'
-                    class Foo
-                    {
-                    	/** @var string */
-                    	const X = 'test';
-                    }
-                    CODE_SAMPLE,
-                <<<'CODE_SAMPLE'
-                    class Foo
-                    {
-                    	const X = 'test';
-                    }
-                    CODE_SAMPLE
-            ),
-        ]);
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getNodeTypes(): array
-    {
-        return [ClassConst::class];
-    }
-
-    /**
-     * @param ClassConst $node
-     */
-    public function refactor(Node $node): ?Node
-    {
-        $phpDocInfo      = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
-        $varTagValueNode = $phpDocInfo->getVarTagValueNode();
-        if (! $varTagValueNode instanceof VarTagValueNode) {
-            return null;
-        }
-
-        $phpDocInfo->removeByType(VarTagValueNode::class);
-
-        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
-
-        return $node;
-    }
-}

From 181b93f922959294b5b837e002cbeb9814183f19 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Nov 2023 13:10:45 +0900
Subject: [PATCH 179/380] docs: add upgrade guide

---
 user_guide_src/source/installation/upgrade_444.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_444.rst b/user_guide_src/source/installation/upgrade_444.rst
index b3773947efd9..e21a1850d613 100644
--- a/user_guide_src/source/installation/upgrade_444.rst
+++ b/user_guide_src/source/installation/upgrade_444.rst
@@ -16,6 +16,14 @@ Please refer to the upgrade instructions corresponding to your installation meth
 Mandatory File Changes
 **********************
 
+Error Files
+===========
+
+Update the following files to show correct error messages:
+
+- app/Views/errors/cli/error_exception.php
+- app/Views/errors/html/error_exception.php
+
 ****************
 Breaking Changes
 ****************

From 886aa89de958c7998a82f664cc919bdec0c5bae5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Nov 2023 19:06:27 +0900
Subject: [PATCH 180/380] feat: log exception classname and all previous
 exceptions

---
 system/Debug/Exceptions.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 37b0376990de..4b3e5cf3ea3e 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -125,12 +125,26 @@ public function exceptionHandler(Throwable $exception)
         [$statusCode, $exitCode] = $this->determineCodes($exception);
 
         if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
-            log_message('critical', "{message}\nin {exFile} on line {exLine}.\n{trace}", [
+            log_message('critical', get_class($exception) . ": {message}\nin {exFile} on line {exLine}.\n{trace}", [
                 'message' => $exception->getMessage(),
                 'exFile'  => clean_path($exception->getFile()), // {file} refers to THIS file
                 'exLine'  => $exception->getLine(), // {line} refers to THIS line
                 'trace'   => self::renderBacktrace($exception->getTrace()),
             ]);
+
+            // Get the first exception.
+            $last = $exception;
+
+            while ($prevException = $last->getPrevious()) {
+                $last = $prevException;
+
+                log_message('critical', '[Caused by] ' . get_class($prevException) . ": {message}\nin {exFile} on line {exLine}.\n{trace}", [
+                    'message' => $prevException->getMessage(),
+                    'exFile'  => clean_path($prevException->getFile()), // {file} refers to THIS file
+                    'exLine'  => $prevException->getLine(), // {line} refers to THIS line
+                    'trace'   => self::renderBacktrace($prevException->getTrace()),
+                ]);
+            }
         }
 
         $this->request  = Services::request();

From 1aee162bde6c5f66cce86c36bf3263da5283027c Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 23 Nov 2023 04:10:44 -0800
Subject: [PATCH 181/380] Fix code style

---
 user_guide_src/source/extending/core_classes/002.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/extending/core_classes/002.php b/user_guide_src/source/extending/core_classes/002.php
index 40d7342686a0..a176459afc60 100644
--- a/user_guide_src/source/extending/core_classes/002.php
+++ b/user_guide_src/source/extending/core_classes/002.php
@@ -12,7 +12,7 @@ public static function routes(bool $getShared = true)
             return static::getSharedInstance('routes');
         }
 
-        return new \App\Libraries\RouteCollection(static::locator(), config(Modules::class), config(Routing::class) );
+        return new \App\Libraries\RouteCollection(static::locator(), config(Modules::class), config(Routing::class));
     }
 
     // ...

From 49ac6640665ff71499d7a3b2d98b85dc26e137a6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 23 Nov 2023 21:12:06 +0900
Subject: [PATCH 182/380] docs: fix incorrect PHPDoc types

---
 system/Database/BaseResult.php       | 6 ++++--
 system/Database/ResultInterface.php  | 5 +++--
 system/Email/Email.php               | 2 +-
 system/HTTP/Files/FileCollection.php | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index c5f603a28127..6f6399cfb2fd 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -254,14 +254,16 @@ public function getResultObject(): array
      *
      * If row doesn't exist, returns null.
      *
-     * @param int    $n    The index of the results to return
-     * @param string $type The type of result object. 'array', 'object' or class name.
+     * @param int|string $n    The index of the results to return, or column name.
+     * @param string     $type The type of result object. 'array', 'object' or class name.
+     * @phpstan-param class-string|'array'|'object' $type
      *
      * @return array|object|stdClass|null
      * @phpstan-return ($type is 'object' ? stdClass|null : ($type is 'array' ? array|null : object|null))
      */
     public function getRow($n = 0, string $type = 'object')
     {
+        // $n is a column name.
         if (! is_numeric($n)) {
             // We cache the row data for subsequent uses
             if (! is_array($this->rowData)) {
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index c959a7cb2292..b06de85ad3be 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -57,8 +57,9 @@ public function getResultObject(): array;
      *
      * If row doesn't exist, returns null.
      *
-     * @param int    $n    The index of the results to return
-     * @param string $type The type of result object. 'array', 'object' or class name.
+     * @param int|string $n    The index of the results to return, or column name.
+     * @param string     $type The type of result object. 'array', 'object' or class name.
+     * @phpstan-param class-string|'array'|'object' $type
      *
      * @return array|object|stdClass|null
      * @phpstan-return ($type is 'object' ? stdClass|null : ($type is 'array' ? array|null : object|null))
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 0adb3e6eb5e6..37a5b56be98d 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -731,7 +731,7 @@ public function setHeader($header, $value)
     }
 
     /**
-     * @param string $email
+     * @param array|string $email
      *
      * @return array
      */
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index f01cc69f5902..8cb1f913e8dc 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -77,7 +77,7 @@ public function getFile(string $name)
     /**
      * Verify if a file exist in the collection of uploaded files and is have been uploaded with multiple option.
      *
-     * @return array|null
+     * @return list<UploadedFile>|null
      */
     public function getFileMultiple(string $name)
     {
@@ -245,7 +245,7 @@ protected function fixFilesArray(array $data): array
      * @param array $index The index sequence we are navigating down
      * @param array $value The portion of the array to process
      *
-     * @return UploadedFile|null
+     * @return list<UploadedFile>|UploadedFile|null
      */
     protected function getValueDotNotationSyntax(array $index, array $value)
     {

From 6bb7c52c70313ae248a8dc0913145d5be25e27a6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Nov 2023 17:43:36 +0900
Subject: [PATCH 183/380] docs: fix PHPDoc types for Model

---
 phpstan-baseline.php | 5 -----
 system/BaseModel.php | 6 ++++--
 system/Model.php     | 6 ++++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 7f9182eeeeda..1322685d6fd2 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -2641,11 +2641,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Model.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(int\\|object\\|string\\|false\\) of method CodeIgniter\\\\Model\\:\\:insert\\(\\) should be covariant with return type \\(bool\\|int\\|string\\) of method CodeIgniter\\\\BaseModel\\:\\:insert\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Model.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset mixed directly on \\$_GET is discouraged\\.$#',
 	'count' => 1,
diff --git a/system/BaseModel.php b/system/BaseModel.php
index f9eed92b1d49..1d854256a63c 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -740,10 +740,12 @@ public function getInsertID()
      * Inserts data into the database. If an object is provided,
      * it will attempt to convert it to an array.
      *
-     * @param array|object|null $data     Data
-     * @param bool              $returnID Whether insert ID should be returned or not.
+     * @param array|object|null $data Data
+     * @phpstan-param row_array|object|null $data
+     * @param bool $returnID Whether insert ID should be returned or not.
      *
      * @return bool|int|string insert ID or true on success. false on failure.
+     * @phpstan-return ($returnID is true ? int|string|false : bool)
      *
      * @throws ReflectionException
      */
diff --git a/system/Model.php b/system/Model.php
index d2f531998fef..3a055531cb5b 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -697,9 +697,11 @@ protected function shouldUpdate($data): bool
      * it will attempt to convert it to an array.
      *
      * @param array|object|null $data
-     * @param bool              $returnID Whether insert ID should be returned or not.
+     * @phpstan-param row_array|object|null $data
+     * @param bool $returnID Whether insert ID should be returned or not.
      *
-     * @return BaseResult|false|int|object|string
+     * @return false|int|object|string
+     * @phpstan-return ($returnID is true ? int|string|false : bool)
      *
      * @throws ReflectionException
      */

From fb0348366ab28d174e772f19f47fb63f1236b0eb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Nov 2023 13:42:44 +0900
Subject: [PATCH 184/380] docs: add missing Time::setTestNow()

---
 user_guide_src/source/testing/overview.rst    | 17 +++++++++++++
 .../source/testing/overview/021.php           | 24 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 user_guide_src/source/testing/overview/021.php

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index d969f73cdc41..2dd63d4eed9e 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -267,6 +267,23 @@ component name:
 
 .. note:: All component Factories are reset by default between each test. Modify your test case's ``$setUpMethods`` if you need instances to persist.
 
+Testing and Time
+================
+
+Testing time-dependent code can be challenging. However, when using the
+:doc:`Time <../libraries/time>` class, the current time can be fixed or changed
+at will during testing.
+
+Below is a sample test code that fixes the current time:
+
+.. literalinclude:: overview/021.php
+
+You can fix the current time with the ``Time::setTestNow()`` method.
+Optionally, you can specify a locale as the second parameter.
+
+Don't forget to reset the current time after the test with calling it without
+parameters.
+
 .. _testing-cli-output:
 
 Testing CLI Output
diff --git a/user_guide_src/source/testing/overview/021.php b/user_guide_src/source/testing/overview/021.php
new file mode 100644
index 000000000000..7a8c7a026afd
--- /dev/null
+++ b/user_guide_src/source/testing/overview/021.php
@@ -0,0 +1,24 @@
+<?php
+
+use CodeIgniter\I18n\Time;
+use CodeIgniter\Test\CIUnitTestCase;
+
+final class TimeDependentCodeTest extends CIUnitTestCase
+{
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        // Reset the current time.
+        Time::setTestNow();
+    }
+
+    public function testFixTime(): void
+    {
+        // Fix the current time to "2023-11-25 12:00:00".
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        // This assertion always passes.
+        $this->assertSame('2023-11-25 12:00:00', (string) Time::now());
+    }
+}

From f3fd116da2a138e642de10e00368f1ecf34b5330 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Nov 2023 13:14:20 +0900
Subject: [PATCH 185/380] test: add tests for Model timestamp

---
 tests/_support/Models/UserTimestampModel.php |  29 +++
 tests/system/Models/TimestampModelTest.php   | 254 +++++++++++++++++++
 2 files changed, 283 insertions(+)
 create mode 100644 tests/_support/Models/UserTimestampModel.php
 create mode 100644 tests/system/Models/TimestampModelTest.php

diff --git a/tests/_support/Models/UserTimestampModel.php b/tests/_support/Models/UserTimestampModel.php
new file mode 100644
index 000000000000..1cc66d334e37
--- /dev/null
+++ b/tests/_support/Models/UserTimestampModel.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
+
+use CodeIgniter\Model;
+
+class UserTimestampModel extends Model
+{
+    protected $table         = 'user';
+    protected $allowedFields = [
+        'name',
+        'email',
+        'country',
+        'deleted_at',
+    ];
+    protected $returnType     = 'array';
+    protected $useSoftDeletes = true;
+    protected $useTimestamps  = true;
+    protected $dateFormat     = 'datetime';
+}
diff --git a/tests/system/Models/TimestampModelTest.php b/tests/system/Models/TimestampModelTest.php
new file mode 100644
index 000000000000..b44461a8a3c9
--- /dev/null
+++ b/tests/system/Models/TimestampModelTest.php
@@ -0,0 +1,254 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Models;
+
+use CodeIgniter\I18n\Time;
+use Tests\Support\Entity\User;
+use Tests\Support\Models\UserTimestampModel;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class TimestampModelTest extends LiveModelTestCase
+{
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = false;
+    protected $seed        = '';
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        // Reset current time.
+        Time::setTestNow();
+    }
+
+    /**
+     * @return int|string Insert ID
+     */
+    private function allowDatesPrepareOneRecord(array $data)
+    {
+        $this->createModel(UserTimestampModel::class);
+        $this->db->table('user')->truncate();
+
+        $this->model->setAllowedFields([
+            'name',
+            'email',
+            'country',
+            'created_at',
+            'updated_at',
+            'deleted_at',
+        ]);
+
+        return $this->model->insert($data, true);
+    }
+
+    /**
+     * @return int|string Insert ID
+     */
+    private function doNotAllowDatesPrepareOneRecord(array $data)
+    {
+        $this->createModel(UserTimestampModel::class);
+        $this->db->table('user')->truncate();
+
+        $this->model->setAllowedFields([
+            'name',
+            'email',
+            'country',
+            // no 'created_at',
+            // no 'updated_at',
+            'deleted_at',
+        ]);
+
+        return $this->model->insert($data, true);
+    }
+
+    public function testDoNotAllowDatesInsertArrayWithoutDatesSetsTimestamp(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'    => 'John Smith',
+            'email'   => 'john@example.com',
+            'country' => 'US',
+            // no created_at
+            // no updated_at
+        ];
+        $id = $this->doNotAllowDatesPrepareOneRecord($data);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
+        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+    }
+
+    public function testDoNotAllowDatesInsertArrayWithDatesSetsTimestamp(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'       => 'John Smith',
+            'email'      => 'john@example.com',
+            'country'    => 'US',
+            'created_at' => '2000-01-01 12:00:00',
+            'updated_at' => '2000-01-01 12:00:00',
+        ];
+        $id = $this->doNotAllowDatesPrepareOneRecord($data);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
+        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+    }
+
+    public function testDoNotAllowDatesUpdateArrayUpdatesUpdatedAt(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'       => 'John Smith',
+            'email'      => 'john@example.com',
+            'country'    => 'US',
+            'created_at' => '2000-01-01 12:00:00',
+            'updated_at' => '2000-01-01 12:00:00',
+        ];
+        $id = $this->doNotAllowDatesPrepareOneRecord($data);
+
+        $user = $this->model->find($id);
+
+        $user['country'] = 'CA';
+        $this->model->update($user['id'], $user);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
+        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+    }
+
+    public function testDoNotAllowDatesUpdateEntityUpdatesUpdatedAt(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'       => 'John Smith',
+            'email'      => 'john@example.com',
+            'country'    => 'US',
+            'created_at' => '2000-01-01 12:00:00',
+            'updated_at' => '2000-01-01 12:00:00',
+        ];
+        $id = $this->doNotAllowDatesPrepareOneRecord($data);
+        $this->setPrivateProperty($this->model, 'returnType', User::class);
+        $this->setPrivateProperty($this->model, 'tempReturnType', User::class);
+
+        $user = $this->model->find($id);
+
+        $user->country = 'CA';
+        $this->model->update($user->id, $user);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2023-11-25 12:00:00', (string) $user->created_at);
+        $this->assertSame('2023-11-25 12:00:00', (string) $user->updated_at);
+    }
+
+    public function testAllowDatesInsertArrayWithoutDatesSetsTimestamp(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'    => 'John Smith',
+            'email'   => 'john@example.com',
+            'country' => 'US',
+            // no created_at
+            // no updated_at
+        ];
+        $id = $this->allowDatesPrepareOneRecord($data);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
+        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+    }
+
+    public function testAllowDatesInsertArrayWithDatesSetsTimestamp(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'       => 'John Smith',
+            'email'      => 'john@example.com',
+            'country'    => 'US',
+            'created_at' => '2000-01-01 12:00:00',
+            'updated_at' => '2000-01-01 12:00:00',
+        ];
+        $id = $this->allowDatesPrepareOneRecord($data);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2000-01-01 12:00:00', $user['created_at']);
+        $this->assertSame('2000-01-01 12:00:00', $user['updated_at']);
+    }
+
+    public function testAllowDatesUpdateArrayUpdatesUpdatedAt(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'       => 'John Smith',
+            'email'      => 'john@example.com',
+            'country'    => 'US',
+            'created_at' => '2000-01-01 12:00:00',
+            'updated_at' => '2000-01-01 12:00:00',
+        ];
+        $id = $this->allowDatesPrepareOneRecord($data);
+
+        $user = $this->model->find($id);
+
+        $user['country'] = 'CA';
+        $this->model->update($user['id'], $user);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2000-01-01 12:00:00', $user['created_at']);
+        $this->assertSame('2000-01-01 12:00:00', $user['updated_at']);
+    }
+
+    public function testAllowDatesUpdateEntityUpdatesUpdatedAt(): void
+    {
+        Time::setTestNow('2023-11-25 12:00:00');
+
+        $data = [
+            'name'       => 'John Smith',
+            'email'      => 'john@example.com',
+            'country'    => 'US',
+            'created_at' => '2000-01-01 12:00:00',
+            'updated_at' => '2000-01-01 12:00:00',
+        ];
+        $id = $this->allowDatesPrepareOneRecord($data);
+        $this->setPrivateProperty($this->model, 'returnType', User::class);
+        $this->setPrivateProperty($this->model, 'tempReturnType', User::class);
+
+        $user = $this->model->find($id);
+
+        $user->country = 'CA';
+        $this->model->update($user->id, $user);
+
+        $user = $this->model->find($id);
+
+        $this->assertSame('2000-01-01 12:00:00', (string) $user->created_at);
+        // The Entity has `updated_at` value, but it will be discarded because of onlyChanged.
+        $this->assertSame('2023-11-25 12:00:00', (string) $user->updated_at);
+    }
+}

From d690553efc77de7ea9dbf8f90c515e01c14f0f76 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Nov 2023 14:24:59 +0900
Subject: [PATCH 186/380] docs: add comments

---
 tests/system/Models/TimestampModelTest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/system/Models/TimestampModelTest.php b/tests/system/Models/TimestampModelTest.php
index b44461a8a3c9..92458449b981 100644
--- a/tests/system/Models/TimestampModelTest.php
+++ b/tests/system/Models/TimestampModelTest.php
@@ -163,6 +163,10 @@ public function testDoNotAllowDatesUpdateEntityUpdatesUpdatedAt(): void
         $this->assertSame('2023-11-25 12:00:00', (string) $user->updated_at);
     }
 
+    /**
+     * We do not recommend to add timestamp fields to $allowedFields.
+     * If you want to add old data to these fields, use Query Builder.
+     */
     public function testAllowDatesInsertArrayWithoutDatesSetsTimestamp(): void
     {
         Time::setTestNow('2023-11-25 12:00:00');
@@ -182,6 +186,10 @@ public function testAllowDatesInsertArrayWithoutDatesSetsTimestamp(): void
         $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
     }
 
+    /**
+     * We do not recommend to add timestamp fields to $allowedFields.
+     * If you want to add old data to these fields, use Query Builder.
+     */
     public function testAllowDatesInsertArrayWithDatesSetsTimestamp(): void
     {
         Time::setTestNow('2023-11-25 12:00:00');
@@ -201,6 +209,10 @@ public function testAllowDatesInsertArrayWithDatesSetsTimestamp(): void
         $this->assertSame('2000-01-01 12:00:00', $user['updated_at']);
     }
 
+    /**
+     * We do not recommend to add timestamp fields to $allowedFields.
+     * If you want to add old data to these fields, use Query Builder.
+     */
     public function testAllowDatesUpdateArrayUpdatesUpdatedAt(): void
     {
         Time::setTestNow('2023-11-25 12:00:00');
@@ -225,6 +237,10 @@ public function testAllowDatesUpdateArrayUpdatesUpdatedAt(): void
         $this->assertSame('2000-01-01 12:00:00', $user['updated_at']);
     }
 
+    /**
+     * We do not recommend to add timestamp fields to $allowedFields.
+     * If you want to add old data to these fields, use Query Builder.
+     */
     public function testAllowDatesUpdateEntityUpdatesUpdatedAt(): void
     {
         Time::setTestNow('2023-11-25 12:00:00');

From d062b568a5cdebacf750eab7215b4bf85f8e5810 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Nov 2023 18:36:07 +0900
Subject: [PATCH 187/380] test: fix assertions for SQLSRV

---
 tests/system/Models/TimestampModelTest.php | 48 ++++++++++++++++------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/tests/system/Models/TimestampModelTest.php b/tests/system/Models/TimestampModelTest.php
index 92458449b981..6df8b014ba60 100644
--- a/tests/system/Models/TimestampModelTest.php
+++ b/tests/system/Models/TimestampModelTest.php
@@ -90,8 +90,12 @@ public function testDoNotAllowDatesInsertArrayWithoutDatesSetsTimestamp(): void
 
         $user = $this->model->find($id);
 
-        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
-        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+        $expected = '2023-11-25 12:00:00';
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $expected .= '.000';
+        }
+        $this->assertSame($expected, $user['created_at']);
+        $this->assertSame($expected, $user['updated_at']);
     }
 
     public function testDoNotAllowDatesInsertArrayWithDatesSetsTimestamp(): void
@@ -109,8 +113,12 @@ public function testDoNotAllowDatesInsertArrayWithDatesSetsTimestamp(): void
 
         $user = $this->model->find($id);
 
-        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
-        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+        $expected = '2023-11-25 12:00:00';
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $expected .= '.000';
+        }
+        $this->assertSame($expected, $user['created_at']);
+        $this->assertSame($expected, $user['updated_at']);
     }
 
     public function testDoNotAllowDatesUpdateArrayUpdatesUpdatedAt(): void
@@ -133,8 +141,12 @@ public function testDoNotAllowDatesUpdateArrayUpdatesUpdatedAt(): void
 
         $user = $this->model->find($id);
 
-        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
-        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+        $expected = '2023-11-25 12:00:00';
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $expected .= '.000';
+        }
+        $this->assertSame($expected, $user['created_at']);
+        $this->assertSame($expected, $user['updated_at']);
     }
 
     public function testDoNotAllowDatesUpdateEntityUpdatesUpdatedAt(): void
@@ -182,8 +194,12 @@ public function testAllowDatesInsertArrayWithoutDatesSetsTimestamp(): void
 
         $user = $this->model->find($id);
 
-        $this->assertSame('2023-11-25 12:00:00', $user['created_at']);
-        $this->assertSame('2023-11-25 12:00:00', $user['updated_at']);
+        $expected = '2023-11-25 12:00:00';
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $expected .= '.000';
+        }
+        $this->assertSame($expected, $user['created_at']);
+        $this->assertSame($expected, $user['updated_at']);
     }
 
     /**
@@ -205,8 +221,12 @@ public function testAllowDatesInsertArrayWithDatesSetsTimestamp(): void
 
         $user = $this->model->find($id);
 
-        $this->assertSame('2000-01-01 12:00:00', $user['created_at']);
-        $this->assertSame('2000-01-01 12:00:00', $user['updated_at']);
+        $expected = '2000-01-01 12:00:00';
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $expected .= '.000';
+        }
+        $this->assertSame($expected, $user['created_at']);
+        $this->assertSame($expected, $user['updated_at']);
     }
 
     /**
@@ -233,8 +253,12 @@ public function testAllowDatesUpdateArrayUpdatesUpdatedAt(): void
 
         $user = $this->model->find($id);
 
-        $this->assertSame('2000-01-01 12:00:00', $user['created_at']);
-        $this->assertSame('2000-01-01 12:00:00', $user['updated_at']);
+        $expected = '2000-01-01 12:00:00';
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $expected .= '.000';
+        }
+        $this->assertSame($expected, $user['created_at']);
+        $this->assertSame($expected, $user['updated_at']);
     }
 
     /**

From 11afcc215202c6ba3c80f9553ecdfb3fb5929d54 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Nov 2023 19:58:32 +0900
Subject: [PATCH 188/380] docs: fix incorrect sample code

---
 user_guide_src/source/incoming/restful.rst     | 4 ++++
 user_guide_src/source/incoming/restful/003.php | 7 +++++--
 user_guide_src/source/incoming/restful/011.php | 7 +++++--
 user_guide_src/source/incoming/routing.rst     | 2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index 9240ac8b476d..d40f27ff6e9f 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -52,6 +52,8 @@ the controller that should be used:
 
 .. literalinclude:: restful/003.php
 
+See also :ref:`controllers-namespace`.
+
 Change the Placeholder Used
 ===========================
 
@@ -122,6 +124,8 @@ the controller that should be used:
 
 .. literalinclude:: restful/011.php
 
+See also :ref:`controllers-namespace`.
+
 Change the Placeholder Used
 ===========================
 
diff --git a/user_guide_src/source/incoming/restful/003.php b/user_guide_src/source/incoming/restful/003.php
index 6610555f0a5f..347fde94c649 100644
--- a/user_guide_src/source/incoming/restful/003.php
+++ b/user_guide_src/source/incoming/restful/003.php
@@ -1,6 +1,9 @@
 <?php
 
-$routes->resource('photos', ['controller' => 'App\Gallery']);
+$routes->resource('photos', ['controller' => 'Gallery']);
+// Would create routes like:
+$routes->get('photos', '\App\Controllers\Gallery::index');
 
+$routes->resource('photos', ['controller' => '\App\Gallery']);
 // Would create routes like:
-$routes->get('photos', 'App\Gallery::index');
+$routes->get('photos', '\App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/011.php b/user_guide_src/source/incoming/restful/011.php
index cbb6f13bdf85..fc3a44b14229 100644
--- a/user_guide_src/source/incoming/restful/011.php
+++ b/user_guide_src/source/incoming/restful/011.php
@@ -1,6 +1,9 @@
 <?php
 
-$routes->presenter('photos', ['controller' => 'App\Gallery']);
+$routes->presenter('photos', ['controller' => 'Gallery']);
+// Would create routes like:
+$routes->get('photos', '\App\Controllers\Gallery::index');
 
+$routes->presenter('photos', ['controller' => '\App\Gallery']);
 // Would create routes like:
-$routes->get('photos', 'App\Gallery::index');
+$routes->get('photos', '\App\Gallery::index');
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index c509f807be87..646b66bd4ffc 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -83,6 +83,8 @@ You can supply multiple verbs that a route should match by passing them in as an
 Specifying Route Handlers
 =========================
 
+.. _controllers-namespace:
+
 Controller's Namespace
 ----------------------
 

From b09f85eb9b1f366b2e37e368dd92c208c1d8c210 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Nov 2023 20:49:20 +0900
Subject: [PATCH 189/380] test: remove unneeded `deleted_at` in $allowedFields

---
 tests/_support/Models/UserTimestampModel.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/_support/Models/UserTimestampModel.php b/tests/_support/Models/UserTimestampModel.php
index 1cc66d334e37..b3772112379b 100644
--- a/tests/_support/Models/UserTimestampModel.php
+++ b/tests/_support/Models/UserTimestampModel.php
@@ -20,7 +20,6 @@ class UserTimestampModel extends Model
         'name',
         'email',
         'country',
-        'deleted_at',
     ];
     protected $returnType     = 'array';
     protected $useSoftDeletes = true;

From f55cb2e44f602cf7215e872ba66a62466c3ee9a4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Nov 2023 21:10:31 +0900
Subject: [PATCH 190/380] docs: add sample code

---
 user_guide_src/source/incoming/restful.rst     | 8 ++++++++
 user_guide_src/source/incoming/restful/003.php | 4 ----
 user_guide_src/source/incoming/restful/011.php | 4 ----
 user_guide_src/source/incoming/restful/017.php | 5 +++++
 user_guide_src/source/incoming/restful/018.php | 7 +++++++
 user_guide_src/source/incoming/restful/019.php | 5 +++++
 user_guide_src/source/incoming/restful/020.php | 7 +++++++
 7 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 user_guide_src/source/incoming/restful/017.php
 create mode 100644 user_guide_src/source/incoming/restful/018.php
 create mode 100644 user_guide_src/source/incoming/restful/019.php
 create mode 100644 user_guide_src/source/incoming/restful/020.php

diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index d40f27ff6e9f..6d111a9302e1 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -52,6 +52,10 @@ the controller that should be used:
 
 .. literalinclude:: restful/003.php
 
+.. literalinclude:: restful/017.php
+
+.. literalinclude:: restful/018.php
+
 See also :ref:`controllers-namespace`.
 
 Change the Placeholder Used
@@ -124,6 +128,10 @@ the controller that should be used:
 
 .. literalinclude:: restful/011.php
 
+.. literalinclude:: restful/019.php
+
+.. literalinclude:: restful/020.php
+
 See also :ref:`controllers-namespace`.
 
 Change the Placeholder Used
diff --git a/user_guide_src/source/incoming/restful/003.php b/user_guide_src/source/incoming/restful/003.php
index 347fde94c649..6f255282622d 100644
--- a/user_guide_src/source/incoming/restful/003.php
+++ b/user_guide_src/source/incoming/restful/003.php
@@ -3,7 +3,3 @@
 $routes->resource('photos', ['controller' => 'Gallery']);
 // Would create routes like:
 $routes->get('photos', '\App\Controllers\Gallery::index');
-
-$routes->resource('photos', ['controller' => '\App\Gallery']);
-// Would create routes like:
-$routes->get('photos', '\App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/011.php b/user_guide_src/source/incoming/restful/011.php
index fc3a44b14229..e08078d47e31 100644
--- a/user_guide_src/source/incoming/restful/011.php
+++ b/user_guide_src/source/incoming/restful/011.php
@@ -3,7 +3,3 @@
 $routes->presenter('photos', ['controller' => 'Gallery']);
 // Would create routes like:
 $routes->get('photos', '\App\Controllers\Gallery::index');
-
-$routes->presenter('photos', ['controller' => '\App\Gallery']);
-// Would create routes like:
-$routes->get('photos', '\App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/017.php b/user_guide_src/source/incoming/restful/017.php
new file mode 100644
index 000000000000..853748f84527
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/017.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->resource('photos', ['controller' => '\App\Gallery']);
+// Would create routes like:
+$routes->get('photos', '\App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/018.php b/user_guide_src/source/incoming/restful/018.php
new file mode 100644
index 000000000000..6951d07b07b3
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/018.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Controllers\Gallery;
+
+$routes->resource('photos', ['namespace' => '', 'controller' => Gallery::class]);
+// Would create routes like:
+$routes->get('photos', '\App\Controllers\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/019.php b/user_guide_src/source/incoming/restful/019.php
new file mode 100644
index 000000000000..09885e7f0039
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/019.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->presenter('photos', ['controller' => '\App\Gallery']);
+// Would create routes like:
+$routes->get('photos', '\App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/020.php b/user_guide_src/source/incoming/restful/020.php
new file mode 100644
index 000000000000..ddd67cc22d93
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/020.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Controllers\Gallery;
+
+$routes->presenter('photos', ['namespace' => '', 'controller' => Gallery::class]);
+// Would create routes like:
+$routes->get('photos', '\App\Controllers\Gallery::index');

From 81352d502747e9829bd9d963d4dda2549d566e3f Mon Sep 17 00:00:00 2001
From: Piyush Garg <62426177+il-coder@users.noreply.github.com>
Date: Sun, 26 Nov 2023 02:41:12 +0530
Subject: [PATCH 191/380] Fix double prefix for increment in cache FileHandler

---
 system/Cache/Handlers/FileHandler.php         |  4 +--
 .../system/Cache/Handlers/FileHandlerTest.php | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index 54cafdc5f35b..0a39c3610ba0 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -150,8 +150,8 @@ public function deleteMatching(string $pattern)
      */
     public function increment(string $key, int $offset = 1)
     {
-        $key = static::validateKey($key, $this->prefix);
-        $tmp = $this->getItem($key);
+        $prefixedKey = static::validateKey($key, $this->prefix);
+        $tmp         = $this->getItem($prefixedKey);
 
         if ($tmp === false) {
             $tmp = ['data' => 0, 'ttl' => 60];
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 11d1c93b9c1c..0bcaccf817c3 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -67,6 +67,10 @@ protected function tearDown(): void
                     chmod($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key, 0777);
                     unlink($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key);
                 }
+                if (is_file($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $this->config->prefix . $key)) {
+                    chmod($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $this->config->prefix . $key, 0777);
+                    unlink($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $this->config->prefix . $key);
+                }
             }
 
             rmdir($this->config->file['storePath']);
@@ -233,6 +237,22 @@ public function testIncrement(): void
         $this->assertSame(10, $this->handler->increment(self::$key3, 10));
     }
 
+    public function testIncrementWithDefaultPrefix(): void
+    {
+        $this->config->prefix = 'test_';
+        $this->handler        = new FileHandler($this->config);
+        $this->handler->initialize();
+
+        $this->handler->save(self::$key1, 1);
+        $this->handler->save(self::$key2, 'value');
+
+        $this->assertSame(11, $this->handler->increment(self::$key1, 10));
+        $this->assertSame($this->handler->increment(self::$key1, 10), $this->handler->get(self::$key1));
+        $this->assertFalse($this->handler->increment(self::$key2, 10));
+        $this->assertSame(10, $this->handler->increment(self::$key3, 10));
+        $this->assertSame($this->handler->increment(self::$key3, 10), $this->handler->get(self::$key3));
+    }
+
     public function testDecrement(): void
     {
         $this->handler->save(self::$key1, 10);
@@ -246,6 +266,21 @@ public function testDecrement(): void
         $this->assertSame(-1, $this->handler->decrement(self::$key3, 1));
     }
 
+    public function testDecrementWithDefaultPrefix(): void
+    {
+        $this->handler->save(self::$key1, 10);
+        $this->handler->save(self::$key2, 'value');
+
+        // Line following commented out to force the cache to add a zero entry for key3
+        // $this->fileHandler->save(self::$key3, 0);
+
+        $this->assertSame(9, $this->handler->decrement(self::$key1, 1));
+        $this->assertSame($this->handler->decrement(self::$key1, 1), $this->handler->get(self::$key1));
+        $this->assertFalse($this->handler->decrement(self::$key2, 1));
+        $this->assertSame(-1, $this->handler->decrement(self::$key3, 1));
+        $this->assertSame($this->handler->decrement(self::$key3, 1), $this->handler->get(self::$key3));
+    }
+
     public function testClean(): void
     {
         $this->handler->save(self::$key1, 1);

From b3f451b30022976e0b72f30226735cb0b15ee4fa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 09:47:52 +0900
Subject: [PATCH 192/380] docs: remove unneeded comments

---
 system/Pager/PagerRenderer.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 454ac9f1cd93..84ba762e5546 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -122,8 +122,6 @@ public function hasPrevious(): bool
      * page before the current page, but is the page just before the
      * "first" page.
      *
-     * You MUST call hasPrevious() first, or this value may be invalid.
-     *
      * @return string|null
      */
     public function getPrevious()
@@ -162,8 +160,6 @@ public function hasNext(): bool
      * page after the current page, but is the page that follows the
      * "last" page.
      *
-     * You MUST call hasNext() first, or this value may be invalid.
-     *
      * @return string|null
      */
     public function getNext()

From 9fcb679a0e974690ee54f77fa85168cd19b9a610 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 09:48:23 +0900
Subject: [PATCH 193/380] docs: add comment to make things clear

---
 system/Pager/PagerRenderer.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 84ba762e5546..274517c4be79 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -25,14 +25,14 @@
 class PagerRenderer
 {
     /**
-     * First page number.
+     * First page number in the current pages being displayed.
      *
      * @var int
      */
     protected $first;
 
     /**
-     * Last page number.
+     * Last page number in the current pages being displayed.
      *
      * @var int
      */
@@ -85,8 +85,11 @@ class PagerRenderer
      */
     public function __construct(array $details)
     {
-        $this->first        = 1;
-        $this->last         = $details['pageCount'];
+        // `first` and `last` will be updated by `setSurroundCount()`.
+        // You must call `setSurroundCount()` after instantiation.
+        $this->first = 1;
+        $this->last  = $details['pageCount'];
+
         $this->current      = $details['currentPage'];
         $this->total        = $details['total'];
         $this->uri          = $details['uri'];
@@ -377,7 +380,7 @@ public function getNextPage()
     }
 
     /**
-     * Returns the page number of the first page.
+     * Returns the page number of the first page in the current pages being displayed.
      */
     public function getFirstPageNumber(): int
     {
@@ -393,7 +396,7 @@ public function getCurrentPageNumber(): int
     }
 
     /**
-     * Returns the page number of the last page.
+     * Returns the page number of the last page in the current pages being displayed.
      */
     public function getLastPageNumber(): int
     {

From 41ae14a0c182543297c52839182a334b47bb5668 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 09:48:58 +0900
Subject: [PATCH 194/380] docs: fix incorrect description

---
 user_guide_src/source/libraries/pagination.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 3cf6f01dadbb..dad0450cd528 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -299,8 +299,8 @@ These methods return the page number for the previous or next pages in relation
 getFirstPageNumber() & getLastPageNumber()
 ------------------------------------------
 
-These methods return page numbers to the first and last pages in the
-result set.
+These methods return page numbers to the first and last pages in the current pages
+being displayed.
 
 getCurrentPageNumber()
 ----------------------

From 3388114da036d53e5d91364fd2b85e630d95cc56 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 09:49:37 +0900
Subject: [PATCH 195/380] docs: add text decoration

---
 user_guide_src/source/libraries/pagination.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index dad0450cd528..a910f451bf35 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -239,7 +239,7 @@ Since the first link displayed is page one, ``hasPrevious()`` would return **fal
 getPrevious() & getNext()
 -------------------------
 
-These methods return the URL for the previous or next pages of results on either side of the numbered links.
+These methods return the **URL** for the previous or next pages of results on either side of the numbered links.
 
 For example, you have the current page set at 5 and you want to have the links before and after (the surroundCount) to be 2 each, that will give you something like this::
 
@@ -252,7 +252,7 @@ If you want to get page 4 and page 6, use ``getPreviousPage()`` and ``getNextPag
 getFirst() & getLast()
 ----------------------
 
-Much like ``getPrevious()`` and ``getNext()``, these methods return links to the first and last pages in the
+Much like ``getPrevious()`` and ``getNext()``, these methods return the **URL** to the first and last pages in the
 result set.
 
 links()
@@ -274,14 +274,14 @@ See following an example with these changes:
 hasPreviousPage() & hasNextPage()
 ---------------------------------
 
-This method returns a boolean true if there are links to a page before and after, respectively, the current page being displayed.
+This method returns a boolean ``true`` if there are links to a page before and after, respectively, the current page being displayed.
 
 Their difference to ``hasPrevious()`` and ``hasNext()`` is that they are based on the current page while ``hasPrevious()`` and ``hasNext()`` are based on the set of links to be displayed before and after the current page based on the value passed in ``setSurroundCount()``.
 
 getPreviousPage() & getNextPage()
 ---------------------------------
 
-These methods return a URL for the previous and next pages in relation to the current page being displayed, unlike ``getPrevious()`` and ``getNext()`` that return the URL for the previous or next pages of results on either side of the numbered links. See the previous paragraph for a full explanation.
+These methods return a **URL** for the previous and next pages in relation to the current page being displayed, unlike ``getPrevious()`` and ``getNext()`` that return the URL for the previous or next pages of results on either side of the numbered links. See the previous paragraph for a full explanation.
 
 For example, you have the current page set at 5 and you want to have the links before and after (the surroundCount) to be 2 each, that will give you something like this::
 

From be2c2f998b50d1b561315733980c0c80d145764f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 09:50:40 +0900
Subject: [PATCH 196/380] docs: add explanations

---
 .../source/libraries/pagination.rst           | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index a910f451bf35..59aad8e9a562 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -227,14 +227,21 @@ setSurroundCount()
 In the first line, the ``setSurroundCount()`` method specifies than we want to show two links to either side of
 the current page link. The only parameter that it accepts is the number of links to show.
 
+.. note:: You must call this method first to generate correct pagination links.
+
 hasPrevious() & hasNext()
 -------------------------
 
-These methods return a boolean true if there are more links that can be displayed on either side of the current page,
-based on the value passed to ``setSurroundCount()``. For example, let's say we have 20 pages of data. The current
-page is page 3. If the surrounding count is 2, then the following links would show up in the list: 1, 2, 3, 4, and 5.
-Since the first link displayed is page one, ``hasPrevious()`` would return **false** since there is no page zero. However,
-``hasNext()`` would return **true** since there are 15 additional pages of results after page five.
+These methods return a boolean ``true`` if there are more links that can be displayed on either side of the current page,
+based on the value passed to ``setSurroundCount()``.
+
+For example, let's say we have 20 pages of data. The current
+page is page 3. If the surrounding count is 2, then the following links would show up like this::
+
+    1  |  2  |  3  |  4  |  5
+
+Since the first link displayed is page one, ``hasPrevious()`` would return ``false`` since there is no page zero. However,
+``hasNext()`` would return ``true`` since there are 15 additional pages of results after page five.
 
 getPrevious() & getNext()
 -------------------------
@@ -278,6 +285,14 @@ This method returns a boolean ``true`` if there are links to a page before and a
 
 Their difference to ``hasPrevious()`` and ``hasNext()`` is that they are based on the current page while ``hasPrevious()`` and ``hasNext()`` are based on the set of links to be displayed before and after the current page based on the value passed in ``setSurroundCount()``.
 
+For example, let's say we have 20 pages of data. The current
+page is page 3. If the surrounding count is 2, then the following links would show up like this::
+
+    1  |  2  |  3  |  4  |  5
+
+``hasPreviousPage()`` would return ``true`` since there is page 2. And,
+``hasNextPage()`` would return ``true`` since there is page 4.
+
 getPreviousPage() & getNextPage()
 ---------------------------------
 

From b98529c4f17ba6f8ee6e32356d49e0dd16530f29 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 10:00:50 +0900
Subject: [PATCH 197/380] docs: make method names links

---
 user_guide_src/source/libraries/pagination.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 59aad8e9a562..0a2d243a8a47 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -233,7 +233,7 @@ hasPrevious() & hasNext()
 -------------------------
 
 These methods return a boolean ``true`` if there are more links that can be displayed on either side of the current page,
-based on the value passed to ``setSurroundCount()``.
+based on the value passed to `setSurroundCount()`_.
 
 For example, let's say we have 20 pages of data. The current
 page is page 3. If the surrounding count is 2, then the following links would show up like this::
@@ -254,12 +254,12 @@ For example, you have the current page set at 5 and you want to have the links b
 
 ``getPrevious()`` returns the URL for page 2. ``getNext()`` returns the URL for page 8.
 
-If you want to get page 4 and page 6, use ``getPreviousPage()`` and ``getNextPage()`` instead.
+If you want to get page 4 and page 6, use `getPreviousPage() & getNextPage()`_ instead.
 
 getFirst() & getLast()
 ----------------------
 
-Much like ``getPrevious()`` and ``getNext()``, these methods return the **URL** to the first and last pages in the
+Much like `getPrevious() & getNext()`_, these methods return the **URL** to the first and last pages in the
 result set.
 
 links()
@@ -270,9 +270,9 @@ title, which is just the number, and a boolean that tells whether the link is th
 
 .. literalinclude:: pagination/013.php
 
-In the code presented for the standard pagination structure, the methods ``getPrevious()`` and ``getNext()`` are used to obtain the links to the previous and next pagination groups respectively.
+In the code presented for the standard pagination structure, the methods `getPrevious() & getNext()`_ are used to obtain the links to the previous and next pagination groups respectively.
 
-If you want to use the pagination structure where prev and next will be links to the previous and next pages based on the current page, just replace the ``getPrevious()`` and ``getNext()`` methods with ``getPreviousPage()`` and ``getNextPage()``, and the methods ``hasPrevious()`` and ``hasNext()`` by ``hasPreviousPage()`` and ``hasNextPage()`` respectively.
+If you want to use the pagination structure where prev and next will be links to the previous and next pages based on the current page, just replace the `getPrevious() & getNext()`_ methods with `getPreviousPage() & getNextPage()`_, and the methods `hasPrevious() & hasNext()`_ by `hasPreviousPage() & hasNextPage()`_ respectively.
 
 See following an example with these changes:
 
@@ -283,7 +283,7 @@ hasPreviousPage() & hasNextPage()
 
 This method returns a boolean ``true`` if there are links to a page before and after, respectively, the current page being displayed.
 
-Their difference to ``hasPrevious()`` and ``hasNext()`` is that they are based on the current page while ``hasPrevious()`` and ``hasNext()`` are based on the set of links to be displayed before and after the current page based on the value passed in ``setSurroundCount()``.
+Their difference to `hasPrevious() & hasNext()`_ is that they are based on the current page while `hasPrevious() & hasNext()`_ are based on the set of links to be displayed before and after the current page based on the value passed in `setSurroundCount()`_.
 
 For example, let's say we have 20 pages of data. The current
 page is page 3. If the surrounding count is 2, then the following links would show up like this::
@@ -296,7 +296,7 @@ page is page 3. If the surrounding count is 2, then the following links would sh
 getPreviousPage() & getNextPage()
 ---------------------------------
 
-These methods return a **URL** for the previous and next pages in relation to the current page being displayed, unlike ``getPrevious()`` and ``getNext()`` that return the URL for the previous or next pages of results on either side of the numbered links. See the previous paragraph for a full explanation.
+These methods return a **URL** for the previous and next pages in relation to the current page being displayed, unlike `getPrevious() & getNext()`_ that return the URL for the previous or next pages of results on either side of the numbered links. See the previous paragraph for a full explanation.
 
 For example, you have the current page set at 5 and you want to have the links before and after (the surroundCount) to be 2 each, that will give you something like this::
 

From 552dc9e67ac94fc4b1916115c723c658a64bff13 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 10:13:17 +0900
Subject: [PATCH 198/380] docs: move some descriptions in note

---
 user_guide_src/source/libraries/pagination.rst | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 0a2d243a8a47..023fbb5af485 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -283,8 +283,6 @@ hasPreviousPage() & hasNextPage()
 
 This method returns a boolean ``true`` if there are links to a page before and after, respectively, the current page being displayed.
 
-Their difference to `hasPrevious() & hasNext()`_ is that they are based on the current page while `hasPrevious() & hasNext()`_ are based on the set of links to be displayed before and after the current page based on the value passed in `setSurroundCount()`_.
-
 For example, let's say we have 20 pages of data. The current
 page is page 3. If the surrounding count is 2, then the following links would show up like this::
 
@@ -293,10 +291,15 @@ page is page 3. If the surrounding count is 2, then the following links would sh
 ``hasPreviousPage()`` would return ``true`` since there is page 2. And,
 ``hasNextPage()`` would return ``true`` since there is page 4.
 
+.. note:: The difference to `hasPrevious() & hasNext()`_ is that they are based
+    on the current page while `hasPrevious() & hasNext()`_ are based on the set
+    of links to be displayed before and after the current page based on the value
+    passed in `setSurroundCount()`_.
+
 getPreviousPage() & getNextPage()
 ---------------------------------
 
-These methods return a **URL** for the previous and next pages in relation to the current page being displayed, unlike `getPrevious() & getNext()`_ that return the URL for the previous or next pages of results on either side of the numbered links. See the previous paragraph for a full explanation.
+These methods return a **URL** for the previous and next pages in relation to the current page being displayed.
 
 For example, you have the current page set at 5 and you want to have the links before and after (the surroundCount) to be 2 each, that will give you something like this::
 
@@ -304,6 +307,9 @@ For example, you have the current page set at 5 and you want to have the links b
 
 ``getPreviousPage()`` returns the URL for page 4. ``getNextPage()`` returns the URL for page 6.
 
+.. note:: `getPrevious() & getNext()`_ returns the URL for the previous or next
+    pages of results on either side of the numbered links.
+
 If you want page numbers instead of URLs, you can use the following methods:
 
 getPreviousPageNumber() & getNextPageNumber()
@@ -314,9 +320,12 @@ These methods return the page number for the previous or next pages in relation
 getFirstPageNumber() & getLastPageNumber()
 ------------------------------------------
 
-These methods return page numbers to the first and last pages in the current pages
+These methods return the page numbers to the first and last pages in the current pages
 being displayed.
 
+.. note:: Unlike `getFirst() & getLast()`_, these methods return the numbers in
+    the current pages being displayed.
+
 getCurrentPageNumber()
 ----------------------
 

From bb3cff4f51a9ee59bebff446f519fd8fb763ce85 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 10:25:09 +0900
Subject: [PATCH 199/380] docs: add @return

---
 system/Pager/PagerRenderer.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 274517c4be79..0e6ff1c5805b 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -259,6 +259,8 @@ public function getCurrent(): string
      * is represented by another array containing of the URI the link
      * should go to, the title (number) of the link, and a boolean
      * value representing whether this link is active or not.
+     *
+     * @return list<array{uri:string, title:int, active:bool}>
      */
     public function links(): array
     {

From b5262e74207b5ad905f1c10c68049e7128c62f58 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Nov 2023 10:31:34 +0900
Subject: [PATCH 200/380] docs: change expression

---
 system/Pager/PagerRenderer.php                 | 8 ++++----
 user_guide_src/source/libraries/pagination.rst | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 0e6ff1c5805b..9e6d2950caf0 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -25,14 +25,14 @@
 class PagerRenderer
 {
     /**
-     * First page number in the current pages being displayed.
+     * First page number in the set of links to be displayed.
      *
      * @var int
      */
     protected $first;
 
     /**
-     * Last page number in the current pages being displayed.
+     * Last page number in the set of links to be displayed.
      *
      * @var int
      */
@@ -382,7 +382,7 @@ public function getNextPage()
     }
 
     /**
-     * Returns the page number of the first page in the current pages being displayed.
+     * Returns the page number of the first page in the set of links to be displayed.
      */
     public function getFirstPageNumber(): int
     {
@@ -398,7 +398,7 @@ public function getCurrentPageNumber(): int
     }
 
     /**
-     * Returns the page number of the last page in the current pages being displayed.
+     * Returns the page number of the last page in the set of links to be displayed.
      */
     public function getLastPageNumber(): int
     {
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 023fbb5af485..364062f04727 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -320,11 +320,11 @@ These methods return the page number for the previous or next pages in relation
 getFirstPageNumber() & getLastPageNumber()
 ------------------------------------------
 
-These methods return the page numbers to the first and last pages in the current pages
-being displayed.
+These methods return the page numbers to the first and last pages in the set of
+links to be displayed.
 
 .. note:: Unlike `getFirst() & getLast()`_, these methods return the numbers in
-    the current pages being displayed.
+    the set of links to be displayed.
 
 getCurrentPageNumber()
 ----------------------

From 066bbbd4bdfcfe9416549946327921c8be2865c4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 05:53:10 +0900
Subject: [PATCH 201/380] docs: add note for how to get the entire dataset's
 first and last page numbers

---
 user_guide_src/source/libraries/pagination.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 364062f04727..126388071dc1 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -323,8 +323,9 @@ getFirstPageNumber() & getLastPageNumber()
 These methods return the page numbers to the first and last pages in the set of
 links to be displayed.
 
-.. note:: Unlike `getFirst() & getLast()`_, these methods return the numbers in
-    the set of links to be displayed.
+.. note:: If you want to get the page numbers to the first and last pages in the
+    result set, the first page number is always 1, and use `getPageCount()`_ to
+    get the last page number.
 
 getCurrentPageNumber()
 ----------------------

From bf6ebaa58f1832fe5bd3f0f944f106b295b42e11 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 09:03:43 +0900
Subject: [PATCH 202/380] docs: remove "in it's database layer"

Entity can be used for data from non-database.
---
 user_guide_src/source/models/entities.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index f1f8b42c8a62..1b91bed7b443 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -2,7 +2,7 @@
 Using Entity Classes
 #####################
 
-CodeIgniter supports Entity classes as a first-class citizen in it's database layer, while keeping
+CodeIgniter supports Entity classes as a first-class citizen, while keeping
 them completely optional to use. They are commonly used as part of the Repository pattern, but can
 be used directly with the :doc:`Model </models/model>` if that fits your needs better.
 

From 2c3ab28430e7f7f2097e3fa734354146a2c826de Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 09:06:16 +0900
Subject: [PATCH 203/380] docs: add note for non-database usage

---
 user_guide_src/source/models/entities.rst | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 1b91bed7b443..7153c459c2e4 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -16,9 +16,17 @@ Entity Usage
 
 At its core, an Entity class is simply a class that represents a single database row. It has class properties
 to represent the database columns, and provides any additional methods to implement the business logic for
-that row. The core feature, though, is that it doesn't know anything about how to persist itself. That's the
+that row.
+
+.. note:: For ease of understanding, the explanation here is based on the case of
+    using a database. However, Entity can also be used for data that does not come
+    from a database.
+
+The core feature, though, is that it doesn't know anything about how to persist itself. That's the
 responsibility of the model or the repository class. That way, if anything changes on how you need to save the
-object, you don't have to change how that object is used throughout the application. This makes it possible to
+object, you don't have to change how that object is used throughout the application.
+
+This makes it possible to
 use JSON or XML files to store the objects during a rapid prototyping stage, and then easily switch to a
 database when you've proven the concept works.
 

From 544093acc87bdc50e6dd94f0bebabb4aefacf7e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 09:06:46 +0900
Subject: [PATCH 204/380] docs: make description more detailed

---
 user_guide_src/source/models/entities.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 7153c459c2e4..072d41e85793 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -78,7 +78,7 @@ access them as if they were public properties. The base class, ``CodeIgniter\Ent
 well as providing the ability to check the properties with ``isset()``, or ``unset()`` the property, and keep track
 of what columns have changed since the object was created or pulled from the database.
 
-.. note:: The Entity class stores the data in the property ``$attributes``.
+.. note:: The Entity class stores the data in the class property ``$attributes`` internally.
 
 When the User is passed to the model's ``save()`` method, it automatically takes care of reading the  properties
 and saving any changes to columns listed in the model's ``$allowedFields`` property. It also knows whether to create

From 0ea1c6a47a5178604a47a1dc2da3be31fe93a712 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 13:39:08 +0900
Subject: [PATCH 205/380] docs: fix by proofreading

Co-authored-by: Samuel Asor <8720569+sammyskills@users.noreply.github.com>
---
 user_guide_src/source/libraries/pagination.rst | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 126388071dc1..3871ec72a2e1 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -320,12 +320,16 @@ These methods return the page number for the previous or next pages in relation
 getFirstPageNumber() & getLastPageNumber()
 ------------------------------------------
 
-These methods return the page numbers to the first and last pages in the set of
-links to be displayed.
+These methods return the page numbers of the first and last pages in the set of
+links to be displayed. For example, if the set of links to be displayed is something like this::
 
-.. note:: If you want to get the page numbers to the first and last pages in the
-    result set, the first page number is always 1, and use `getPageCount()`_ to
-    get the last page number.
+    3  |  4  |  5  |  6  |  7
+
+``getFirstPageNumber()`` will return 3 while ``getLastPageNumber()`` will return 7.    
+
+.. note:: To obtain the page numbers of the first and last pages in the entire
+    result set, you can use the following approach: The first page number is always 1, and `getPageCount()`_ can be used to
+    retrieve the last page number.
 
 getCurrentPageNumber()
 ----------------------

From 01727888a020f6ae071614eef60bb6ad432a3584 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:27:44 +0000
Subject: [PATCH 206/380] chore(deps-dev): update rector/rector requirement

Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](https://github.com/rectorphp/rector/compare/0.18.10...0.18.11)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4ff56944a3b1..03008c6de3ca 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.10",
+        "rector/rector": "0.18.11",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

From 7e7821bdf550c42bbb2be0926f32d7f05bc2f7b8 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Sun, 26 Nov 2023 12:53:38 +0000
Subject: [PATCH 207/380] add: skip hostname checks if CURLRequest options
 'verify' is set to false.

When CURLRequest options 'verify' is set to false, some CURLOPT_SSL_... options should be disabled in such a way as to allow requests to pass through in case the destination is for example on private networks.

Avoids SSL errors: SSL: certificate subject name 'CA' does not match target host name 'localhost'
---
 system/HTTP/CURLRequest.php           | 6 ++++++
 tests/system/HTTP/CURLRequestTest.php | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index c8b3b9fe9f92..15e8e65d5579 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -559,6 +559,12 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
                 $curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
             } elseif (is_bool($config['verify'])) {
                 $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
+
+                if ($config['verify'] === false) {
+                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;
+                } else {
+                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
+                }
             }
         }
 
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 186284da6ba6..25a8c30669d0 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -529,6 +529,9 @@ public function testSSLVerification(): void
 
         $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
         $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
+
+        $this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options);
+        $this->assertSame(2, $options[CURLOPT_SSL_VERIFYHOST]);
     }
 
     public function testSSLWithBadKey(): void

From 368523263cfa73d80d2114ddbf3122b6c8235fa2 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Mon, 27 Nov 2023 19:14:21 +0000
Subject: [PATCH 208/380] add: SSL verify options when config.verify is string
 and boolean

---
 system/HTTP/CURLRequest.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 15e8e65d5579..2eb4aa388a49 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -555,16 +555,17 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
                     throw HTTPException::forInvalidSSLKey($config['ssl_key']);
                 }
 
-                $curlOptions[CURLOPT_CAINFO]         = $file;
-                $curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
-            } elseif (is_bool($config['verify'])) {
-                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
-
-                if ($config['verify'] === false) {
-                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;
-                } else {
+                $curlOptions[CURLOPT_CAINFO] = $file;
+                if ($config['verify'] === 'yes') {
+                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
                     $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
+                } else {
+                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = 0;
+                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;
                 }
+            } elseif (is_bool($config['verify'])) {
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
+                $curlOptions[CURLOPT_SSL_VERIFYHOST] = $config['verify'] ? 2 : 0;
             }
         }
 

From e159bfd8a059c19dc55f58a8ea491e111bcb9df6 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Tue, 28 Nov 2023 07:48:10 +0000
Subject: [PATCH 209/380] fix: CURLOPT_SSL_VERIFYPEER values and tests related
 with CURLOPT_SSL_VERIFYPEER and CURLOPT_SSL_VERIFYHOST

---
 system/HTTP/CURLRequest.php                     |  4 ++--
 .../HTTP/CURLRequestDoNotShareOptionsTest.php   |  2 +-
 tests/system/HTTP/CURLRequestTest.php           | 17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 2eb4aa388a49..5edd9af6859e 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -557,10 +557,10 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
 
                 $curlOptions[CURLOPT_CAINFO] = $file;
                 if ($config['verify'] === 'yes') {
-                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
+                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = true;
                     $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
                 } else {
-                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = 0;
+                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = false;
                     $curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;
                 }
             } elseif (is_bool($config['verify'])) {
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index d8e96424dae5..39dc0409afb9 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -545,7 +545,7 @@ public function testSSLVerification(): void
         $this->assertSame($file, $options[CURLOPT_CAINFO]);
 
         $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
-        $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
+        $this->assertTrue($options[CURLOPT_SSL_VERIFYPEER]);
     }
 
     public function testSSLWithBadKey(): void
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 25a8c30669d0..a947acee7163 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -528,12 +528,27 @@ public function testSSLVerification(): void
         $this->assertSame($file, $options[CURLOPT_CAINFO]);
 
         $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
-        $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
+        $this->assertTrue($options[CURLOPT_SSL_VERIFYPEER]);
 
         $this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options);
         $this->assertSame(2, $options[CURLOPT_SSL_VERIFYHOST]);
     }
 
+    public function testNoSSL(): void
+    {
+        $this->request->request('get', 'http://example.com', [
+            'verify' => false,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
+        $this->assertFalse($options[CURLOPT_SSL_VERIFYPEER]);
+
+        $this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options);
+        $this->assertSame(0, $options[CURLOPT_SSL_VERIFYHOST]);
+    }
+
     public function testSSLWithBadKey(): void
     {
         $file = 'something_obviously_bogus';

From 50412c771fb52878d8a65cde087639998a8d3d7b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 29 Nov 2023 07:15:04 +0900
Subject: [PATCH 210/380] docs: add about session table change

---
 user_guide_src/source/installation/upgrade_sessions.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index 888ff5d751c0..ecc27360f310 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -14,6 +14,7 @@ Documentations
 What has been changed
 =====================
 - Only small things like the method names and the loading of the library have changed.
+- The definition of the session table in Database Driver has changed.
 
 Upgrade Guide
 =============
@@ -24,6 +25,7 @@ Upgrade Guide
     - To set data use ``$session->set($array);`` instead of ``$this->session->set_userdata($array);``.
     - To remove data use ``unset($_SESSION['some_name']);`` or ``$session->remove('some_name');`` instead of ``$this->session->unset_userdata('some_name');``.
     - To mark session data as flashdata, which will only be available for the next request, use ``$session->markAsFlashdata('item');`` instead of ``$this->session->mark_as_flash('item');```
+3. If you use Database Driver, you need to recreate the session table. See :ref:`sessions-databasehandler-driver`.
 
 Code Example
 ============

From 84903e0f58b69f62bb978eec2134a42085ab56ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 06:57:53 +0900
Subject: [PATCH 211/380] chore: update Kint to 5.1.0

---
 system/ThirdParty/Kint/CallFinder.php         |  5 +-
 system/ThirdParty/Kint/Kint.php               |  5 +-
 .../Kint/Parser/BlacklistPlugin.php           |  3 +-
 .../ThirdParty/Kint/Parser/ClosurePlugin.php  |  2 +-
 system/ThirdParty/Kint/Parser/Parser.php      |  4 +-
 .../Kint/Parser/PluginInterface.php           |  2 +-
 system/ThirdParty/Kint/Parser/TablePlugin.php |  6 ++
 .../ThirdParty/Kint/Renderer/RichRenderer.php | 76 ++++++++++++-------
 .../Kint/Renderer/Text/AbstractPlugin.php     |  2 +-
 .../ThirdParty/Kint/Renderer/TextRenderer.php | 18 ++++-
 system/ThirdParty/Kint/Utils.php              |  2 -
 system/ThirdParty/Kint/Zval/BlobValue.php     |  6 +-
 .../Representation/ColorRepresentation.php    |  4 +-
 .../MicrotimeRepresentation.php               |  2 +-
 .../Zval/Representation/Representation.php    |  2 +-
 .../Representation/SourceRepresentation.php   |  2 +-
 system/ThirdParty/Kint/Zval/Value.php         |  8 +-
 system/ThirdParty/Kint/init.php               |  1 +
 system/ThirdParty/Kint/init_helpers.php       |  4 +-
 .../Kint/resources/compiled/aante-dark.css    |  1 +
 .../Kint/resources/compiled/aante-light.css   |  2 +-
 .../Kint/resources/compiled/original.css      |  2 +-
 .../Kint/resources/compiled/plain.css         |  2 +-
 .../resources/compiled/solarized-dark.css     |  2 +-
 .../Kint/resources/compiled/solarized.css     |  2 +-
 25 files changed, 101 insertions(+), 64 deletions(-)
 create mode 100644 system/ThirdParty/Kint/resources/compiled/aante-dark.css

diff --git a/system/ThirdParty/Kint/CallFinder.php b/system/ThirdParty/Kint/CallFinder.php
index e36e91eac0d0..f85b1ae017a9 100644
--- a/system/ThirdParty/Kint/CallFinder.php
+++ b/system/ThirdParty/Kint/CallFinder.php
@@ -138,7 +138,7 @@ class CallFinder
     /**
      * @psalm-param callable-array|callable-string $function
      *
-     * @param mixed $function
+     * @psalm-return list<array{parameters: list, modifiers: list<PhpToken>}>
      *
      * @return array List of matching calls on the relevant line
      */
@@ -187,6 +187,7 @@ public static function getFunctionCalls(string $source, int $line, $function): a
             $identifier[T_NAME_RELATIVE] = true;
         }
 
+        /** @psalm-var list<PhpToken> */
         $tokens = \token_get_all($source);
         $cursor = 1;
         $function_calls = [];
@@ -449,8 +450,6 @@ private static function realTokenIndex(array $tokens, int $index): ?int
      * for `$token[0]` then "..." will incorrectly match the "." operator.
      *
      * @psalm-param PhpToken $token The token to check
-     *
-     * @param mixed $token
      */
     private static function tokenIsOperator($token): bool
     {
diff --git a/system/ThirdParty/Kint/Kint.php b/system/ThirdParty/Kint/Kint.php
index 47e34abef52b..418c1f3f8789 100644
--- a/system/ThirdParty/Kint/Kint.php
+++ b/system/ThirdParty/Kint/Kint.php
@@ -133,7 +133,7 @@ class Kint implements FacadeInterface
     public static $aliases = [
         ['Kint\\Kint', 'dump'],
         ['Kint\\Kint', 'trace'],
-        ['Kint\\Kint', 'dumpArray'],
+        ['Kint\\Kint', 'dumpAll'],
     ];
 
     /**
@@ -537,7 +537,7 @@ public static function trace()
      *
      * Functionally equivalent to Kint::dump(1) or Kint::dump(debug_backtrace())
      *
-     * @param mixed ...$args
+     * @psalm-param array ...$args
      *
      * @return int|string
      */
@@ -599,6 +599,7 @@ public static function shortenPath(string $file): string
         $match = '/';
 
         foreach (static::$app_root_dirs as $path => $alias) {
+            /** @psalm-var string $path */
             if (empty($path)) {
                 continue;
             }
diff --git a/system/ThirdParty/Kint/Parser/BlacklistPlugin.php b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
index 90ec3c223327..fa54a3a6743e 100644
--- a/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
+++ b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
@@ -29,6 +29,7 @@
 
 use Kint\Zval\InstanceValue;
 use Kint\Zval\Value;
+use Psr\Container\ContainerInterface;
 
 class BlacklistPlugin extends AbstractPlugin
 {
@@ -44,7 +45,7 @@ class BlacklistPlugin extends AbstractPlugin
      *
      * @var array
      */
-    public static $shallow_blacklist = ['Psr\\Container\\ContainerInterface'];
+    public static $shallow_blacklist = [ContainerInterface::class];
 
     public function getTypes(): array
     {
diff --git a/system/ThirdParty/Kint/Parser/ClosurePlugin.php b/system/ThirdParty/Kint/Parser/ClosurePlugin.php
index 8b199781078e..84ea582646f8 100644
--- a/system/ThirdParty/Kint/Parser/ClosurePlugin.php
+++ b/system/ThirdParty/Kint/Parser/ClosurePlugin.php
@@ -67,7 +67,7 @@ public function parse(&$var, Value &$o, int $trigger): void
         }
 
         $p = new Representation('Parameters');
-        $p->contents = &$o->parameters;
+        $p->contents = $o->parameters;
         $o->addRepresentation($p, 0);
 
         $statics = [];
diff --git a/system/ThirdParty/Kint/Parser/Parser.php b/system/ThirdParty/Kint/Parser/Parser.php
index 50642b90a123..f044a9de913f 100644
--- a/system/ThirdParty/Kint/Parser/Parser.php
+++ b/system/ThirdParty/Kint/Parser/Parser.php
@@ -72,7 +72,7 @@ class Parser
      * @param int     $depth_limit Maximum depth to parse data
      * @param ?string $caller      Caller class name
      */
-    public function __construct(int $depth_limit = 0, ?string $caller = null)
+    public function __construct(int $depth_limit = 0, string $caller = null)
     {
         $this->marker = "kint\0".\random_bytes(16);
 
@@ -83,7 +83,7 @@ public function __construct(int $depth_limit = 0, ?string $caller = null)
     /**
      * Set the caller class.
      */
-    public function setCallerClass(?string $caller = null): void
+    public function setCallerClass(string $caller = null): void
     {
         $this->noRecurseCall();
 
diff --git a/system/ThirdParty/Kint/Parser/PluginInterface.php b/system/ThirdParty/Kint/Parser/PluginInterface.php
index ff169fd17d4d..3afb1a77674b 100644
--- a/system/ThirdParty/Kint/Parser/PluginInterface.php
+++ b/system/ThirdParty/Kint/Parser/PluginInterface.php
@@ -38,7 +38,7 @@ public function getTypes(): array;
     public function getTriggers(): int;
 
     /**
-     * @param mixed &$var
+     * @psalm-param mixed &$var
      */
     public function parse(&$var, Value &$o, int $trigger): void;
 }
diff --git a/system/ThirdParty/Kint/Parser/TablePlugin.php b/system/ThirdParty/Kint/Parser/TablePlugin.php
index 8d7e155c95cc..5afe75980bc8 100644
--- a/system/ThirdParty/Kint/Parser/TablePlugin.php
+++ b/system/ThirdParty/Kint/Parser/TablePlugin.php
@@ -30,6 +30,12 @@
 use Kint\Zval\Representation\Representation;
 use Kint\Zval\Value;
 
+// Note: Interaction with ArrayLimitPlugin:
+// Any array limited children will be shown in tables identically to
+// non-array-limited children since the table only shows that it is an array
+// and it's size anyway. Because ArrayLimitPlugin halts the parse on finding
+// a limit all other plugins including this one are stopped, so you cannot get
+// a tabular representation of an array that is longer than the limit.
 class TablePlugin extends AbstractPlugin
 {
     public function getTypes(): array
diff --git a/system/ThirdParty/Kint/Renderer/RichRenderer.php b/system/ThirdParty/Kint/Renderer/RichRenderer.php
index f206e560c9c0..b3d86ea1dd5f 100644
--- a/system/ThirdParty/Kint/Renderer/RichRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/RichRenderer.php
@@ -140,6 +140,13 @@ class RichRenderer extends AbstractRenderer
      */
     public static $sort = self::SORT_NONE;
 
+    /**
+     * Timestamp to print in footer in date() format.
+     *
+     * @var ?string
+     */
+    public static $timestamp = null;
+
     public static $needs_pre_render = true;
     public static $needs_folder_render = true;
 
@@ -465,29 +472,7 @@ public function postRender(): string
             $output .= '<nav></nav>';
         }
 
-        if (isset($this->call_info['callee']['file'])) {
-            $output .= 'Called from '.$this->ideLink(
-                $this->call_info['callee']['file'],
-                $this->call_info['callee']['line']
-            );
-        }
-
-        if (
-            isset($this->call_info['callee']['function']) &&
-            (
-                !empty($this->call_info['callee']['class']) ||
-                !\in_array(
-                    $this->call_info['callee']['function'],
-                    ['include', 'include_once', 'require', 'require_once'],
-                    true
-                )
-            )
-        ) {
-            $output .= ' [';
-            $output .= $this->call_info['callee']['class'] ?? '';
-            $output .= $this->call_info['callee']['type'] ?? '';
-            $output .= $this->call_info['callee']['function'].'()]';
-        }
+        $output .= $this->calledFrom();
 
         if (!empty($this->call_info['trace']) && \count($this->call_info['trace']) > 1) {
             $output .= '<ol>';
@@ -497,8 +482,8 @@ public function postRender(): string
                 }
 
                 $output .= '<li>'.$this->ideLink($step['file'], $step['line']); // closing tag not required
-                if (isset($step['function'])
-                    && !\in_array($step['function'], ['include', 'include_once', 'require', 'require_once'], true)
+                if (isset($step['function']) &&
+                    !\in_array($step['function'], ['include', 'include_once', 'require', 'require_once'], true)
                 ) {
                     $output .= ' [';
                     $output .= $step['class'] ?? '';
@@ -516,8 +501,6 @@ public function postRender(): string
 
     /**
      * @psalm-param Encoding $encoding
-     *
-     * @param mixed $encoding
      */
     public function escape(string $string, $encoding = false): string
     {
@@ -559,6 +542,45 @@ public function ideLink(string $file, int $line): string
         return '<a '.$class.'href="'.$this->escape($ideLink).'">'.$path.'</a>';
     }
 
+    protected function calledFrom(): string
+    {
+        $output = '';
+
+        if (isset($this->call_info['callee']['file'])) {
+            $output .= ' '.$this->ideLink(
+                $this->call_info['callee']['file'],
+                $this->call_info['callee']['line']
+            );
+        }
+
+        if (
+            isset($this->call_info['callee']['function']) &&
+            (
+                !empty($this->call_info['callee']['class']) ||
+                !\in_array(
+                    $this->call_info['callee']['function'],
+                    ['include', 'include_once', 'require', 'require_once'],
+                    true
+                )
+            )
+        ) {
+            $output .= ' [';
+            $output .= $this->call_info['callee']['class'] ?? '';
+            $output .= $this->call_info['callee']['type'] ?? '';
+            $output .= $this->call_info['callee']['function'].'()]';
+        }
+
+        if ('' !== $output) {
+            $output = 'Called from'.$output;
+        }
+
+        if (null !== self::$timestamp) {
+            $output .= ' '.\date(self::$timestamp);
+        }
+
+        return $output;
+    }
+
     protected function renderTab(Value $o, Representation $rep): string
     {
         if (($plugin = $this->getPlugin(self::$tab_plugins, $rep->hints)) && $plugin instanceof TabPluginInterface) {
diff --git a/system/ThirdParty/Kint/Renderer/Text/AbstractPlugin.php b/system/ThirdParty/Kint/Renderer/Text/AbstractPlugin.php
index 4d3c7e2a9791..16feccaab6c5 100644
--- a/system/ThirdParty/Kint/Renderer/Text/AbstractPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Text/AbstractPlugin.php
@@ -42,7 +42,7 @@ public function __construct(TextRenderer $r)
         $this->renderer = $r;
     }
 
-    public function renderLockedHeader(Value $o, ?string $content = null): string
+    public function renderLockedHeader(Value $o, string $content = null): string
     {
         $out = '';
 
diff --git a/system/ThirdParty/Kint/Renderer/TextRenderer.php b/system/ThirdParty/Kint/Renderer/TextRenderer.php
index 833320a6c196..2538e4da06af 100644
--- a/system/ThirdParty/Kint/Renderer/TextRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/TextRenderer.php
@@ -108,6 +108,13 @@ class TextRenderer extends AbstractRenderer
      */
     public static $sort = self::SORT_NONE;
 
+    /**
+     * Timestamp to print in footer in date() format.
+     *
+     * @var ?string
+     */
+    public static $timestamp = null;
+
     public $header_width = 80;
     public $indent_width = 4;
 
@@ -300,7 +307,7 @@ public function filterParserPlugins(array $plugins): array
     {
         $return = [];
 
-        foreach ($plugins as $index => $plugin) {
+        foreach ($plugins as $plugin) {
             foreach (self::$parser_plugin_whitelist as $whitelist) {
                 if ($plugin instanceof $whitelist) {
                     $return[] = $plugin;
@@ -319,8 +326,6 @@ public function ideLink(string $file, int $line): string
 
     /**
      * @psalm-param Encoding $encoding
-     *
-     * @param mixed $encoding
      */
     public function escape(string $string, $encoding = false): string
     {
@@ -355,6 +360,13 @@ protected function calledFrom(): string
             $output .= $this->call_info['callee']['function'].'()]';
         }
 
+        if (null !== self::$timestamp) {
+            if (\strlen($output)) {
+                $output .= ' ';
+            }
+            $output .= \date(self::$timestamp);
+        }
+
         return $output;
     }
 
diff --git a/system/ThirdParty/Kint/Utils.php b/system/ThirdParty/Kint/Utils.php
index 78b5a1e8c5ca..545709586dc4 100644
--- a/system/ThirdParty/Kint/Utils.php
+++ b/system/ThirdParty/Kint/Utils.php
@@ -255,8 +255,6 @@ public static function normalizeAliases(array &$aliases): void
 
     /**
      * @psalm-param Encoding $encoding
-     *
-     * @param mixed $encoding
      */
     public static function truncateString(string $input, int $length = PHP_INT_MAX, string $end = '...', $encoding = false): string
     {
diff --git a/system/ThirdParty/Kint/Zval/BlobValue.php b/system/ThirdParty/Kint/Zval/BlobValue.php
index ff5a6a24cfc9..5e9f129d1181 100644
--- a/system/ThirdParty/Kint/Zval/BlobValue.php
+++ b/system/ThirdParty/Kint/Zval/BlobValue.php
@@ -122,8 +122,6 @@ public function transplant(Value $old): void
 
     /**
      * @psalm-param Encoding $encoding
-     *
-     * @param mixed $encoding
      */
     public static function strlen(string $string, $encoding = false): int
     {
@@ -142,10 +140,8 @@ public static function strlen(string $string, $encoding = false): int
 
     /**
      * @psalm-param Encoding $encoding
-     *
-     * @param mixed $encoding
      */
-    public static function substr(string $string, int $start, ?int $length = null, $encoding = false): string
+    public static function substr(string $string, int $start, int $length = null, $encoding = false): string
     {
         if (\function_exists('mb_substr')) {
             if (false === $encoding) {
diff --git a/system/ThirdParty/Kint/Zval/Representation/ColorRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/ColorRepresentation.php
index 806a800667d4..8853603440c3 100644
--- a/system/ThirdParty/Kint/Zval/Representation/ColorRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/ColorRepresentation.php
@@ -211,7 +211,7 @@ public function __construct(string $value)
         $this->setValues($value);
     }
 
-    public function getColor(?int $variant = null): ?string
+    public function getColor(int $variant = null): ?string
     {
         if (!$variant) {
             $variant = $this->variant;
@@ -275,7 +275,7 @@ public function getColor(?int $variant = null): ?string
         return null;
     }
 
-    public function hasAlpha(?int $variant = null): bool
+    public function hasAlpha(int $variant = null): bool
     {
         if (null === $variant) {
             $variant = $this->variant;
diff --git a/system/ThirdParty/Kint/Zval/Representation/MicrotimeRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/MicrotimeRepresentation.php
index d25539b1c7c6..027b0ce21f38 100644
--- a/system/ThirdParty/Kint/Zval/Representation/MicrotimeRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/MicrotimeRepresentation.php
@@ -44,7 +44,7 @@ class MicrotimeRepresentation extends Representation
     public $mem_peak_real = 0;
     public $hints = ['microtime'];
 
-    public function __construct(int $seconds, int $microseconds, int $group, ?float $lap = null, ?float $total = null, int $i = 0)
+    public function __construct(int $seconds, int $microseconds, int $group, float $lap = null, float $total = null, int $i = 0)
     {
         parent::__construct('Microtime');
 
diff --git a/system/ThirdParty/Kint/Zval/Representation/Representation.php b/system/ThirdParty/Kint/Zval/Representation/Representation.php
index c4680c3d1f75..76d695b8d599 100644
--- a/system/ThirdParty/Kint/Zval/Representation/Representation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/Representation.php
@@ -36,7 +36,7 @@ class Representation
 
     protected $name;
 
-    public function __construct(string $label, ?string $name = null)
+    public function __construct(string $label, string $name = null)
     {
         $this->label = $label;
 
diff --git a/system/ThirdParty/Kint/Zval/Representation/SourceRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/SourceRepresentation.php
index d05bf088d46a..2fefc582ccc9 100644
--- a/system/ThirdParty/Kint/Zval/Representation/SourceRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/SourceRepresentation.php
@@ -57,7 +57,7 @@ public function __construct(string $filename, int $line, int $padding = 7)
      * @param int      $start_line The first line to display (1 based)
      * @param null|int $length     Amount of lines to show
      */
-    public static function getSource(string $filename, int $start_line = 1, ?int $length = null): ?array
+    public static function getSource(string $filename, int $start_line = 1, int $length = null): ?array
     {
         if (!$filename || !\file_exists($filename) || !\is_readable($filename)) {
             return null;
diff --git a/system/ThirdParty/Kint/Zval/Value.php b/system/ThirdParty/Kint/Zval/Value.php
index facb6cd835e4..01a206d48a9c 100644
--- a/system/ThirdParty/Kint/Zval/Value.php
+++ b/system/ThirdParty/Kint/Zval/Value.php
@@ -53,8 +53,8 @@ class Value
     public $reference = false;
     public $depth = 0;
     public $size;
-    public $value;
     public $hints = [];
+    public $value;
 
     protected $representations = [];
 
@@ -62,7 +62,7 @@ public function __construct()
     {
     }
 
-    public function addRepresentation(Representation $rep, ?int $pos = null): bool
+    public function addRepresentation(Representation $rep, int $pos = null): bool
     {
         if (isset($this->representations[$rep->getName()])) {
             return false;
@@ -81,7 +81,7 @@ public function addRepresentation(Representation $rep, ?int $pos = null): bool
         return true;
     }
 
-    public function replaceRepresentation(Representation $rep, ?int $pos = null): void
+    public function replaceRepresentation(Representation $rep, int $pos = null): void
     {
         if (null === $pos) {
             $this->representations[$rep->getName()] = $rep;
@@ -234,7 +234,7 @@ public function transplant(self $old): void
     /**
      * Creates a new basic object with a name and access path.
      */
-    public static function blank(?string $name = null, ?string $access_path = null): self
+    public static function blank(string $name = null, string $access_path = null): self
     {
         $o = new self();
         $o->name = $name;
diff --git a/system/ThirdParty/Kint/init.php b/system/ThirdParty/Kint/init.php
index 7605415b6e6e..039489ab43ad 100644
--- a/system/ThirdParty/Kint/init.php
+++ b/system/ThirdParty/Kint/init.php
@@ -45,6 +45,7 @@
 \define('KINT_PHP81', \version_compare(PHP_VERSION, '8.1') >= 0);
 \define('KINT_PHP82', \version_compare(PHP_VERSION, '8.2') >= 0);
 \define('KINT_PHP83', \version_compare(PHP_VERSION, '8.3') >= 0);
+\define('KINT_PHP84', \version_compare(PHP_VERSION, '8.4') >= 0);
 
 // Dynamic default settings
 if (false !== \ini_get('xdebug.file_link_format')) {
diff --git a/system/ThirdParty/Kint/init_helpers.php b/system/ThirdParty/Kint/init_helpers.php
index 561425b2a0d6..b4d5f4d9bd86 100644
--- a/system/ThirdParty/Kint/init_helpers.php
+++ b/system/ThirdParty/Kint/init_helpers.php
@@ -32,7 +32,7 @@
     /**
      * Alias of Kint::dump().
      *
-     * @param mixed ...$args
+     * @psalm-param mixed ...$args
      *
      * @return int|string
      */
@@ -53,7 +53,7 @@ function d(...$args)
      *
      * If run in CLI colors are disabled
      *
-     * @param mixed ...$args
+     * @psalm-param mixed ...$args
      *
      * @return int|string
      */
diff --git a/system/ThirdParty/Kint/resources/compiled/aante-dark.css b/system/ThirdParty/Kint/resources/compiled/aante-dark.css
new file mode 100644
index 000000000000..6aa8b702cb23
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/aante-dark.css
@@ -0,0 +1 @@
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(0,0,0,.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#555;color:#e2e1e1}.kint-rich .kint-focused{box-shadow:0 0 3px 2px aqua}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#e2e1e1;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#070707;border:1px solid #282828;color:#e2e1e1;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#555}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiNBQUEiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjQUFBIi8+PC9zdmc+") no-repeat scroll 0 0/15px 75px rgba(0,0,0,0);cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #282828}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#f90;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:aqua}.kint-rich dfn{font-style:normal;font-family:monospace;color:#e2e1e1}.kint-rich pre{color:#e2e1e1;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #282828;background:#070707;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(226,225,225,.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#070707;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#e2e1e1;background:#070707}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #282828;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#e2e1e1;background:#070707;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#070707;opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#070707}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#070707;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:rgba(0,0,0,0)}.kint-rich footer>.kint-popup-trigger{background:rgba(0,0,0,0);color:#e2e1e1}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#e2e1e1;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#e2e1e1;border-bottom:1px dotted #e2e1e1}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #282828}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#070707;border:1px solid #282828;border-top:0}.kint-rich ul.kint-tabs>li{background:#070707;border:1px solid #282828;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#555;color:aqua}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#070707;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#555;color:aqua}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #282828;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#555}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #282828;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#070707;color:#e2e1e1}.kint-rich table td{background:#070707;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #555 inset}.kint-rich table tr:hover var{color:aqua}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #070707}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #555;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#070707}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #555,0 1px #555,1px 0 #555,0 -1px #555;color:#070707;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px aqua}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#070707}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#070707;border:1px solid #282828;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #282828;background:#000;font-weight:bold;padding-top:0;border-bottom:1px solid #000 !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #000}.kint-rich ul>li>pre{border:1px solid #282828}.kint-rich dt:hover+dd>ul{border-color:#555}.kint-rich pre{background:#000;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#303}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#000}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#000}.kint-rich table tr:hover>td{box-shadow:none;background:#303}
diff --git a/system/ThirdParty/Kint/resources/compiled/aante-light.css b/system/ThirdParty/Kint/resources/compiled/aante-light.css
index 832dee718de4..16194736e83c 100644
--- a/system/ThirdParty/Kint/resources/compiled/aante-light.css
+++ b/system/ThirdParty/Kint/resources/compiled/aante-light.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#aaa;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#f8f8f8;border:1px solid #d7d7d7;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#aaa}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #d7d7d7}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#06f;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:red}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #d7d7d7;background:#f8f8f8;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#f8f8f8;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#f8f8f8}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #d7d7d7;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#f8f8f8;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#f8f8f8;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f8f8f8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#f8f8f8;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #d7d7d7}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#f8f8f8;border:1px solid #d7d7d7;border-top:0}.kint-rich ul.kint-tabs>li{background:#f8f8f8;border:1px solid #d7d7d7;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#aaa;color:red}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#f8f8f8;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#aaa;color:red}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #d7d7d7;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#aaa}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #d7d7d7;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#f8f8f8;color:#1d1e1e}.kint-rich table td{background:#f8f8f8;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #aaa inset}.kint-rich table tr:hover var{color:red}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #f8f8f8}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #aaa;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#f8f8f8}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #aaa,0 1px #aaa,1px 0 #aaa,0 -1px #aaa;color:#f8f8f8;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#f8f8f8}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#f8f8f8;border:1px solid #d7d7d7;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #d7d7d7;background:#fff;font-weight:bold;padding-top:0;border-bottom:1px solid #fff !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #fff}.kint-rich ul>li>pre{border:1px solid #d7d7d7}.kint-rich dt:hover+dd>ul{border-color:#aaa}.kint-rich pre{background:#fff;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#cfc}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#fff}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#fff}.kint-rich table tr:hover>td{box-shadow:none;background:#cfc}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#aaa;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#f8f8f8;border:1px solid #d7d7d7;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#aaa}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px rgba(0,0,0,0);cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #d7d7d7}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#06f;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:red}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #d7d7d7;background:#f8f8f8;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#f8f8f8;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#f8f8f8}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #d7d7d7;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#f8f8f8;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#f8f8f8;opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f8f8f8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#f8f8f8;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:rgba(0,0,0,0)}.kint-rich footer>.kint-popup-trigger{background:rgba(0,0,0,0);color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #d7d7d7}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#f8f8f8;border:1px solid #d7d7d7;border-top:0}.kint-rich ul.kint-tabs>li{background:#f8f8f8;border:1px solid #d7d7d7;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#aaa;color:red}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#f8f8f8;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#aaa;color:red}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #d7d7d7;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#aaa}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #d7d7d7;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#f8f8f8;color:#1d1e1e}.kint-rich table td{background:#f8f8f8;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #aaa inset}.kint-rich table tr:hover var{color:red}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #f8f8f8}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #aaa;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#f8f8f8}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #aaa,0 1px #aaa,1px 0 #aaa,0 -1px #aaa;color:#f8f8f8;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#f8f8f8}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#f8f8f8;border:1px solid #d7d7d7;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #d7d7d7;background:#fff;font-weight:bold;padding-top:0;border-bottom:1px solid #fff !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #fff}.kint-rich ul>li>pre{border:1px solid #d7d7d7}.kint-rich dt:hover+dd>ul{border-color:#aaa}.kint-rich pre{background:#fff;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#cfc}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#fff}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#fff}.kint-rich table tr:hover>td{box-shadow:none;background:#cfc}
diff --git a/system/ThirdParty/Kint/resources/compiled/original.css b/system/ThirdParty/Kint/resources/compiled/original.css
index e3c2bf413adb..331b2c38fb65 100644
--- a/system/ThirdParty/Kint/resources/compiled/original.css
+++ b/system/ThirdParty/Kint/resources/compiled/original.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#0092db;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#0092db}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxnIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0iI0ZGRiI+PHBhdGggZD0iTTEgMWgyOHYyOEgxem01IDE0aDE4bS05IDlWNk0xIDYxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzM3OSIvPjxwYXRoIGQ9Ik0xIDMxaDI4djI4SDF6bTUgMTRoMThtLTkgOVYzNk0xIDkxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzVBMyIvPjxwYXRoIGQ9Ik0xIDEyMWgyOHYyOEgxem01IDVsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZT0iI0NDQyIvPjwvZz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#0092db;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#5cb730}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#e0eaef;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#e0eaef}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #b6cedb;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#c1d4df;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#d0d0d0;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#e8e8e8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#c1d4df;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint-rich ul.kint-tabs>li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #b6cedb;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#0092db}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-rich table td{background:#e0eaef;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-rich table tr:hover var{color:#5cb730}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #c1d4df}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #0092db;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#c1d4df}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #0092db,0 1px #0092db,1px 0 #0092db,0 -1px #0092db;color:#e0eaef;font-weight:bold}input.kint-note-input{width:100%}.kint-rich>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint-rich ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%)}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint-rich>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%)}.kint-rich .kint-source .kint-highlight{background:#f0eb96}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#0092db;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#0092db}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxnIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0iI0ZGRiI+PHBhdGggZD0iTTEgMWgyOHYyOEgxem01IDE0aDE4bS05IDlWNk0xIDYxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzM3OSIvPjxwYXRoIGQ9Ik0xIDMxaDI4djI4SDF6bTUgMTRoMThtLTkgOVYzNk0xIDkxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzVBMyIvPjxwYXRoIGQ9Ik0xIDEyMWgyOHYyOEgxem01IDVsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZT0iI0NDQyIvPjwvZz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px rgba(0,0,0,0);cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#0092db;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#5cb730}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#e0eaef;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#e0eaef}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #b6cedb;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#c1d4df;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#d0d0d0;opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#e8e8e8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#c1d4df;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:rgba(0,0,0,0)}.kint-rich footer>.kint-popup-trigger{background:rgba(0,0,0,0);color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint-rich ul.kint-tabs>li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #b6cedb;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#0092db}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-rich table td{background:#e0eaef;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-rich table tr:hover var{color:#5cb730}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #c1d4df}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #0092db;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#c1d4df}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #0092db,0 1px #0092db,1px 0 #0092db,0 -1px #0092db;color:#e0eaef;font-weight:bold}input.kint-note-input{width:100%}.kint-rich>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint-rich ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%)}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint-rich>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%)}.kint-rich .kint-source .kint-highlight{background:#f0eb96}
diff --git a/system/ThirdParty/Kint/resources/compiled/plain.css b/system/ThirdParty/Kint/resources/compiled/plain.css
index ba1eba0ae27f..85a4e739408c 100644
--- a/system/ThirdParty/Kint/resources/compiled/plain.css
+++ b/system/ThirdParty/Kint/resources/compiled/plain.css
@@ -1 +1 @@
-.kint-plain{background:rgba(255,255,255,0.9);white-space:pre;display:block;font-family:monospace;color:#222}.kint-plain i{color:#d00;font-style:normal}.kint-plain u{color:#030;text-decoration:none;font-weight:bold}.kint-plain .kint-microtime-lap{font-weight:bold;text-shadow:1px 0 #fff, 0 1px #fff, -1px 0 #fff, 0 -1px #fff}
+.kint-plain{background:rgba(255,255,255,.9);white-space:pre;display:block;font-family:monospace;color:#222}.kint-plain i{color:#d00;font-style:normal}.kint-plain u{color:#030;text-decoration:none;font-weight:bold}.kint-plain .kint-microtime-lap{font-weight:bold;text-shadow:1px 0 #fff,0 1px #fff,-1px 0 #fff,0 -1px #fff}
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
index 4ab5e287c54a..2cc125edca72 100644
--- a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
+++ b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px rgba(0,0,0,0);cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:rgba(0,0,0,0)}.kint-rich footer>.kint-popup-trigger{background:rgba(0,0,0,0);color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd}
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized.css b/system/ThirdParty/Kint/resources/compiled/solarized.css
index 952453edc311..8c1a67f08969 100644
--- a/system/ThirdParty/Kint/resources/compiled/solarized.css
+++ b/system/ThirdParty/Kint/resources/compiled/solarized.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#657b83}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#586e75}.kint-rich pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(101,123,131,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#fdf6e3;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#657b83;background:#fdf6e3}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #93a1a1;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#586e75;background:#eee8d5;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#e2e2e2;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f0f0f0}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#eee8d5;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#657b83}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#657b83;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint-rich ul.kint-tabs>li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #93a1a1;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #93a1a1;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#eee8d5;color:#586e75}.kint-rich table td{background:#fdf6e3;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #eee8d5}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#eee8d5}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#fdf6e3;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#657b83}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px rgba(0,0,0,0);cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#586e75}.kint-rich pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(101,123,131,.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#fdf6e3;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#657b83;background:#fdf6e3}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #93a1a1;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#586e75;background:#eee8d5;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#e2e2e2;opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f0f0f0}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#eee8d5;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:rgba(0,0,0,0)}.kint-rich footer>.kint-popup-trigger{background:rgba(0,0,0,0);color:#657b83}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#657b83;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint-rich ul.kint-tabs>li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #93a1a1;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #93a1a1;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#eee8d5;color:#586e75}.kint-rich table td{background:#fdf6e3;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #eee8d5}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#eee8d5}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#fdf6e3;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}

From 1c20d682702996b8fbe78cb549f158525a64a1de Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 07:05:18 +0900
Subject: [PATCH 212/380] fix: autoload helpers in test bootstrap

---
 system/Test/bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 3145725afe96..fcd3c9498af3 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -75,6 +75,7 @@
 
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
+Services::autoloader()->loadHelpers();
 
 // Now load Composer's if it's available
 if (is_file(COMPOSER_PATH)) {

From 31388c84a2dd77a6a6b03490085ad1d62aefa5e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 11:42:10 +0900
Subject: [PATCH 213/380] docs: fix description for getXMLFromResult()

---
 user_guide_src/source/database/utilities.rst   | 18 +++++++++++-------
 .../source/database/utilities/001.php          | 18 ++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index 6bbc99b28ced..43349809b194 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -8,18 +8,17 @@ The Database Utility Class contains methods that help you manage your database.
     :local:
     :depth: 2
 
-*******************
-Get XML from Result
-*******************
 
-getXMLFromResult()
-==================
+Export a Query Result as an XML Document
+========================================
 
-This method returns the xml result from database result. You can do like this:
+Permits you to generate an XML file from a query result. The first
+parameter expects a query result object, the second may contain an
+optional array of config parameters. Example:
 
 .. literalinclude:: utilities/001.php
 
-and it will get the following xml result::
+and it will get the following xml result when the ``mytable`` has columns ``id`` and ``name``::
 
     <root>
         <element>
@@ -27,3 +26,8 @@ and it will get the following xml result::
             <name>bar</name>
         </element>
     </root>
+
+.. important:: This method will NOT write the XML file for you. It
+    simply creates the XML layout. If you need to write the file
+    use the :php:func:`write_file()` helper.
+
diff --git a/user_guide_src/source/database/utilities/001.php b/user_guide_src/source/database/utilities/001.php
index 41582ffca023..6cdfacd81834 100644
--- a/user_guide_src/source/database/utilities/001.php
+++ b/user_guide_src/source/database/utilities/001.php
@@ -1,13 +1,15 @@
 <?php
 
-class MyModel extends \CodeIgniter\Model
-{
-    protected $table      = 'foo';
-    protected $primaryKey = 'id';
-}
+$db     = db_connect();
+$dbutil = \CodeIgniter\Database\Config::utils();
 
-$model = new MyModel();
+$query = $db->query('SELECT * FROM mytable');
 
-$util = \CodeIgniter\Database\Config::utils();
+$config = [
+    'root'    => 'root',
+    'element' => 'element',
+    'newline' => "\n",
+    'tab'     => "\t",
+];
 
-echo $util->getXMLFromResult($model->get());
+echo $dbutil->getXMLFromResult($query, $config);

From 3e076d3706f3a84b2e2e0dd00bb7e414659f5fdf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 11:50:12 +0900
Subject: [PATCH 214/380] docs: add "Initializing the Utility Class"

---
 user_guide_src/source/database/utilities.rst  | 28 ++++++++++++++++---
 .../source/database/utilities/002.php         |  3 ++
 .../source/database/utilities/003.php         |  3 ++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 user_guide_src/source/database/utilities/002.php
 create mode 100644 user_guide_src/source/database/utilities/003.php

diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index 43349809b194..8a094cfff549 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -1,6 +1,6 @@
-#########
-Utilities
-#########
+######################
+Database Utility Class
+######################
 
 The Database Utility Class contains methods that help you manage your database.
 
@@ -8,6 +8,27 @@ The Database Utility Class contains methods that help you manage your database.
     :local:
     :depth: 2
 
+******************************
+Initializing the Utility Class
+******************************
+
+Load the Utility Class as follows:
+
+.. literalinclude:: utilities/002.php
+    :lines: 2-
+
+You can also pass another database group to the DB Utility loader, in case
+the database you want to manage isn't the default one:
+
+.. literalinclude:: utilities/003.php
+    :lines: 2-
+
+In the above example, we're passing a database group name as the first
+parameter.
+
+****************************
+Using the Database Utilities
+****************************
 
 Export a Query Result as an XML Document
 ========================================
@@ -30,4 +51,3 @@ and it will get the following xml result when the ``mytable`` has columns ``id``
 .. important:: This method will NOT write the XML file for you. It
     simply creates the XML layout. If you need to write the file
     use the :php:func:`write_file()` helper.
-
diff --git a/user_guide_src/source/database/utilities/002.php b/user_guide_src/source/database/utilities/002.php
new file mode 100644
index 000000000000..895dd88fd58c
--- /dev/null
+++ b/user_guide_src/source/database/utilities/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$dbutil = \CodeIgniter\Database\Config::utils();
diff --git a/user_guide_src/source/database/utilities/003.php b/user_guide_src/source/database/utilities/003.php
new file mode 100644
index 000000000000..1c2754822637
--- /dev/null
+++ b/user_guide_src/source/database/utilities/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$dbutil = \CodeIgniter\Database\Config::utils('group_name');

From b555ce2ba419ba95655c8ca75a6fb3f3e7bbe7f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 16:02:45 +0900
Subject: [PATCH 215/380] docs: fix factory classname

---
 user_guide_src/source/database/utilities/001.php | 2 +-
 user_guide_src/source/database/utilities/002.php | 2 +-
 user_guide_src/source/database/utilities/003.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/database/utilities/001.php b/user_guide_src/source/database/utilities/001.php
index 6cdfacd81834..131222efc86b 100644
--- a/user_guide_src/source/database/utilities/001.php
+++ b/user_guide_src/source/database/utilities/001.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/database/utilities/002.php b/user_guide_src/source/database/utilities/002.php
index 895dd88fd58c..42bbbd63acc6 100644
--- a/user_guide_src/source/database/utilities/002.php
+++ b/user_guide_src/source/database/utilities/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
diff --git a/user_guide_src/source/database/utilities/003.php b/user_guide_src/source/database/utilities/003.php
index 1c2754822637..5c6527dc543a 100644
--- a/user_guide_src/source/database/utilities/003.php
+++ b/user_guide_src/source/database/utilities/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$dbutil = \CodeIgniter\Database\Config::utils('group_name');
+$dbutil = \Config\Database::utils('group_name');

From 17eb8920f68acfa3705e5947cafa6eb842282545 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 12:19:43 +0900
Subject: [PATCH 216/380] docs: add missing methods in Database Utility Class

---
 user_guide_src/source/database/utilities.rst  | 78 +++++++++++++++++++
 .../source/database/utilities/004.php         |  9 +++
 .../source/database/utilities/005.php         |  7 ++
 .../source/database/utilities/006.php         |  7 ++
 .../source/database/utilities/007.php         |  7 ++
 .../source/database/utilities/008.php         |  9 +++
 .../source/database/utilities/009.php         |  8 ++
 .../source/database/utilities/010.php         | 12 +++
 8 files changed, 137 insertions(+)
 create mode 100644 user_guide_src/source/database/utilities/004.php
 create mode 100644 user_guide_src/source/database/utilities/005.php
 create mode 100644 user_guide_src/source/database/utilities/006.php
 create mode 100644 user_guide_src/source/database/utilities/007.php
 create mode 100644 user_guide_src/source/database/utilities/008.php
 create mode 100644 user_guide_src/source/database/utilities/009.php
 create mode 100644 user_guide_src/source/database/utilities/010.php

diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index 8a094cfff549..eeb88cd1853d 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -30,6 +30,84 @@ parameter.
 Using the Database Utilities
 ****************************
 
+Retrieve List of Database Names
+================================
+
+Returns an array of database names:
+
+.. literalinclude:: utilities/004.php
+    :lines: 2-
+
+Determine If a Database Exists
+==============================
+
+Sometimes it's helpful to know whether a particular database exists.
+Returns a boolean ``true``/``false``. Usage example:
+
+.. literalinclude:: utilities/005.php
+    :lines: 2-
+
+.. note:: Replace ``database_name`` with the name of the database you are
+    looking for. This method is case sensitive.
+
+Optimize a Table
+================
+
+Permits you to optimize a table using the table name specified in the
+first parameter. Returns ``true``/``false`` based on success or failure:
+
+.. literalinclude:: utilities/006.php
+    :lines: 2-
+
+.. note:: Not all database platforms support table optimization. It is
+    mostly for use with MySQL.
+
+Repair a Table
+==============
+
+Permits you to repair a table using the table name specified in the
+first parameter. Returns ``true``/``false`` based on success or failure:
+
+.. literalinclude:: utilities/007.php
+    :lines: 2-
+
+.. note:: Not all database platforms support table repairs.
+
+Optimize a Database
+===================
+
+Permits you to optimize the database your DB class is currently
+connected to. Returns an array containing the DB status messages or
+``false`` on failure:
+
+.. literalinclude:: utilities/008.php
+    :lines: 2-
+
+.. note:: Not all database platforms support database optimization. It
+    it is mostly for use with MySQL.
+
+Export a Query Result as a CSV File
+===================================
+
+Permits you to generate a CSV file from a query result. The first
+parameter of the method must contain the result object from your
+query. Example:
+
+.. literalinclude:: utilities/009.php
+    :lines: 2-
+
+The second, third, and fourth parameters allow you to set the delimiter
+newline, and enclosure characters respectively. By default commas are
+used as the delimiter, ``"\n"`` is used as a new line, and a double-quote
+is used as the enclosure. Example:
+
+.. literalinclude:: utilities/010.php
+    :lines: 2-
+
+.. important:: This method will NOT write the CSV file for you. It
+    simply creates the CSV layout. If you need to write the file
+    use the :php:func:`write_file()` helper.
+
 Export a Query Result as an XML Document
 ========================================
 
diff --git a/user_guide_src/source/database/utilities/004.php b/user_guide_src/source/database/utilities/004.php
new file mode 100644
index 000000000000..4a6b4f673859
--- /dev/null
+++ b/user_guide_src/source/database/utilities/004.php
@@ -0,0 +1,9 @@
+<?php
+
+$dbutil = \CodeIgniter\Database\Config::utils();
+
+$dbs = $dbutil->listDatabases();
+
+foreach ($dbs as $db) {
+    echo $db;
+}
diff --git a/user_guide_src/source/database/utilities/005.php b/user_guide_src/source/database/utilities/005.php
new file mode 100644
index 000000000000..77b0310708e5
--- /dev/null
+++ b/user_guide_src/source/database/utilities/005.php
@@ -0,0 +1,7 @@
+<?php
+
+$dbutil = \CodeIgniter\Database\Config::utils();
+
+if ($dbutil->databaseExists('database_name')) {
+    // some code...
+}
diff --git a/user_guide_src/source/database/utilities/006.php b/user_guide_src/source/database/utilities/006.php
new file mode 100644
index 000000000000..7fe39efdfdd8
--- /dev/null
+++ b/user_guide_src/source/database/utilities/006.php
@@ -0,0 +1,7 @@
+<?php
+
+$dbutil = \CodeIgniter\Database\Config::utils();
+
+if ($dbutil->optimize_table('table_name')) {
+    echo 'Success!';
+}
diff --git a/user_guide_src/source/database/utilities/007.php b/user_guide_src/source/database/utilities/007.php
new file mode 100644
index 000000000000..603b69cc9342
--- /dev/null
+++ b/user_guide_src/source/database/utilities/007.php
@@ -0,0 +1,7 @@
+<?php
+
+$dbutil = \CodeIgniter\Database\Config::utils();
+
+if ($dbutil->repairTable('table_name')) {
+    echo 'Success!';
+}
diff --git a/user_guide_src/source/database/utilities/008.php b/user_guide_src/source/database/utilities/008.php
new file mode 100644
index 000000000000..b5f19a33fd9e
--- /dev/null
+++ b/user_guide_src/source/database/utilities/008.php
@@ -0,0 +1,9 @@
+<?php
+
+$dbutil = \CodeIgniter\Database\Config::utils();
+
+$result = $dbutil->optimizeDatabase();
+
+if ($result !== false) {
+    print_r($result);
+}
diff --git a/user_guide_src/source/database/utilities/009.php b/user_guide_src/source/database/utilities/009.php
new file mode 100644
index 000000000000..054d88afa95e
--- /dev/null
+++ b/user_guide_src/source/database/utilities/009.php
@@ -0,0 +1,8 @@
+<?php
+
+$db     = db_connect();
+$dbutil = \CodeIgniter\Database\Config::utils();
+
+$query = $db->query('SELECT * FROM mytable');
+
+echo $dbutil->getCSVFromResult($query);
diff --git a/user_guide_src/source/database/utilities/010.php b/user_guide_src/source/database/utilities/010.php
new file mode 100644
index 000000000000..c2b50a17360f
--- /dev/null
+++ b/user_guide_src/source/database/utilities/010.php
@@ -0,0 +1,12 @@
+<?php
+
+$db     = db_connect();
+$dbutil = \CodeIgniter\Database\Config::utils();
+
+$query = $db->query('SELECT * FROM mytable');
+
+$delimiter = ',';
+$newline   = "\r\n";
+$enclosure = '"';
+
+echo $dbutil->getCSVFromResult($query, $delimiter, $newline, $enclosure);

From e4d390313f85d153980ccd7cbf6580a85da2b3a7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 12:54:57 +0900
Subject: [PATCH 217/380] docs: remove unimplemented repairTable()

---
 user_guide_src/source/database/utilities.rst     | 11 -----------
 user_guide_src/source/database/utilities/007.php |  7 -------
 2 files changed, 18 deletions(-)
 delete mode 100644 user_guide_src/source/database/utilities/007.php

diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index eeb88cd1853d..c8c11e51d864 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -62,17 +62,6 @@ first parameter. Returns ``true``/``false`` based on success or failure:
 .. note:: Not all database platforms support table optimization. It is
     mostly for use with MySQL.
 
-Repair a Table
-==============
-
-Permits you to repair a table using the table name specified in the
-first parameter. Returns ``true``/``false`` based on success or failure:
-
-.. literalinclude:: utilities/007.php
-    :lines: 2-
-
-.. note:: Not all database platforms support table repairs.
-
 Optimize a Database
 ===================
 
diff --git a/user_guide_src/source/database/utilities/007.php b/user_guide_src/source/database/utilities/007.php
deleted file mode 100644
index 603b69cc9342..000000000000
--- a/user_guide_src/source/database/utilities/007.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$dbutil = \CodeIgniter\Database\Config::utils();
-
-if ($dbutil->repairTable('table_name')) {
-    echo 'Success!';
-}

From 7e55e4503fca0aef05416cbdf34e0fdeb2a06456 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 12:58:12 +0900
Subject: [PATCH 218/380] docs: fix CI3's method name

---
 user_guide_src/source/database/utilities/006.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/utilities/006.php b/user_guide_src/source/database/utilities/006.php
index 7fe39efdfdd8..6de4d1fdc6a7 100644
--- a/user_guide_src/source/database/utilities/006.php
+++ b/user_guide_src/source/database/utilities/006.php
@@ -2,6 +2,6 @@
 
 $dbutil = \CodeIgniter\Database\Config::utils();
 
-if ($dbutil->optimize_table('table_name')) {
+if ($dbutil->optimizeTable('table_name')) {
     echo 'Success!';
 }

From 4542dd58fbd79a97d36ef510088733e16c7b3a29 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 30 Nov 2023 16:07:28 +0900
Subject: [PATCH 219/380] docs: fix factory method name

---
 user_guide_src/source/database/utilities/004.php | 2 +-
 user_guide_src/source/database/utilities/005.php | 2 +-
 user_guide_src/source/database/utilities/006.php | 2 +-
 user_guide_src/source/database/utilities/008.php | 2 +-
 user_guide_src/source/database/utilities/009.php | 2 +-
 user_guide_src/source/database/utilities/010.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/database/utilities/004.php b/user_guide_src/source/database/utilities/004.php
index 4a6b4f673859..3908bb7ad76c 100644
--- a/user_guide_src/source/database/utilities/004.php
+++ b/user_guide_src/source/database/utilities/004.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
 
 $dbs = $dbutil->listDatabases();
 
diff --git a/user_guide_src/source/database/utilities/005.php b/user_guide_src/source/database/utilities/005.php
index 77b0310708e5..92ddaa3487ce 100644
--- a/user_guide_src/source/database/utilities/005.php
+++ b/user_guide_src/source/database/utilities/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
 
 if ($dbutil->databaseExists('database_name')) {
     // some code...
diff --git a/user_guide_src/source/database/utilities/006.php b/user_guide_src/source/database/utilities/006.php
index 6de4d1fdc6a7..e85a07933798 100644
--- a/user_guide_src/source/database/utilities/006.php
+++ b/user_guide_src/source/database/utilities/006.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
 
 if ($dbutil->optimizeTable('table_name')) {
     echo 'Success!';
diff --git a/user_guide_src/source/database/utilities/008.php b/user_guide_src/source/database/utilities/008.php
index b5f19a33fd9e..726b15a822dd 100644
--- a/user_guide_src/source/database/utilities/008.php
+++ b/user_guide_src/source/database/utilities/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
 
 $result = $dbutil->optimizeDatabase();
 
diff --git a/user_guide_src/source/database/utilities/009.php b/user_guide_src/source/database/utilities/009.php
index 054d88afa95e..f8bf84f6a499 100644
--- a/user_guide_src/source/database/utilities/009.php
+++ b/user_guide_src/source/database/utilities/009.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/database/utilities/010.php b/user_guide_src/source/database/utilities/010.php
index c2b50a17360f..7e11cc18019b 100644
--- a/user_guide_src/source/database/utilities/010.php
+++ b/user_guide_src/source/database/utilities/010.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = \CodeIgniter\Database\Config::utils();
+$dbutil = \Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 

From e601954b35db48ebdd8042d24d1a2e6c6fd5a960 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Thu, 30 Nov 2023 11:18:56 +0000
Subject: [PATCH 220/380] recreate fix: CURLOPT_SSL_VERIFYPEER values and tests
 related with CURLOPT_SSL_VERIFYPEER and CURLOPT_SSL_VERIFYHOST

---
 system/HTTP/CURLRequest.php                   | 25 ++++++++-----------
 .../HTTP/CURLRequestDoNotShareOptionsTest.php |  9 ++++---
 tests/system/HTTP/CURLRequestTest.php         |  6 ++---
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 5edd9af6859e..9392e2446b8e 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -548,24 +548,21 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
 
         // SSL Verification
         if (isset($config['verify'])) {
-            if (is_string($config['verify'])) {
-                $file = realpath($config['ssl_key']) ?: $config['ssl_key'];
+            $configVerify = $config['verify'];
+
+            if (is_string($configVerify)) {
+                $file = realpath($configVerify) ?: $configVerify;
 
                 if (! is_file($file)) {
-                    throw HTTPException::forInvalidSSLKey($config['ssl_key']);
+                    throw HTTPException::forInvalidSSLKey($configVerify);
                 }
 
-                $curlOptions[CURLOPT_CAINFO] = $file;
-                if ($config['verify'] === 'yes') {
-                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = true;
-                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
-                } else {
-                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = false;
-                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;
-                }
-            } elseif (is_bool($config['verify'])) {
-                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
-                $curlOptions[CURLOPT_SSL_VERIFYHOST] = $config['verify'] ? 2 : 0;
+                $curlOptions[CURLOPT_CAINFO]         = $file;
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = true;
+                $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
+            } elseif (is_bool($configVerify)) {
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $configVerify;
+                $curlOptions[CURLOPT_SSL_VERIFYHOST] = $configVerify ? 2 : 0;
             }
         }
 
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index 39dc0409afb9..32e60b1418b3 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -535,8 +535,7 @@ public function testSSLVerification(): void
         $file = __FILE__;
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
 
         $options = $this->request->curl_options;
@@ -546,6 +545,9 @@ public function testSSLVerification(): void
 
         $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
         $this->assertTrue($options[CURLOPT_SSL_VERIFYPEER]);
+
+        $this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options);
+        $this->assertSame(2, $options[CURLOPT_SSL_VERIFYHOST]);
     }
 
     public function testSSLWithBadKey(): void
@@ -554,8 +556,7 @@ public function testSSLWithBadKey(): void
         $this->expectException(HTTPException::class);
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
     }
 
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index a947acee7163..4893266e5009 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -518,8 +518,7 @@ public function testSSLVerification(): void
         $file = __FILE__;
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
 
         $options = $this->request->curl_options;
@@ -555,8 +554,7 @@ public function testSSLWithBadKey(): void
         $this->expectException(HTTPException::class);
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
     }
 

From f8dd0b70b23edd315bfd2bc8640073899cb0bf42 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Thu, 30 Nov 2023 17:49:04 +0000
Subject: [PATCH 221/380] Updated Bugs and Breaking sections

Revert to ['verify'] instead of
---
 CHANGELOG.md                                |  7 +++++++
 system/HTTP/CURLRequest.php                 | 14 ++++++--------
 user_guide_src/source/changelogs/v4.4.4.rst |  6 ++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cf10b0f8372..9dbee6dba64c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [v4.4.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.4) (Unreleased)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.3...v4.4.4)
+
+### Fixed Bugs
+
+* fix: [CURLRequest] skip hostname checks if options 'verify' false by @NicolaeIotu in https://github.com/codeigniter4/CodeIgniter4/pull/8258
+
 ## [v4.4.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.3) (2023-10-26)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.2...v4.4.3)
 
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 9392e2446b8e..500b425d2dc5 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -548,21 +548,19 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
 
         // SSL Verification
         if (isset($config['verify'])) {
-            $configVerify = $config['verify'];
-
-            if (is_string($configVerify)) {
-                $file = realpath($configVerify) ?: $configVerify;
+            if (is_string($config['verify'])) {
+                $file = realpath($config['verify']) ?: $config['verify'];
 
                 if (! is_file($file)) {
-                    throw HTTPException::forInvalidSSLKey($configVerify);
+                    throw HTTPException::forInvalidSSLKey($config['verify']);
                 }
 
                 $curlOptions[CURLOPT_CAINFO]         = $file;
                 $curlOptions[CURLOPT_SSL_VERIFYPEER] = true;
                 $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
-            } elseif (is_bool($configVerify)) {
-                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $configVerify;
-                $curlOptions[CURLOPT_SSL_VERIFYHOST] = $configVerify ? 2 : 0;
+            } elseif (is_bool($config['verify'])) {
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
+                $curlOptions[CURLOPT_SSL_VERIFYHOST] = $config['verify'] ? 2 : 0;
             }
         }
 
diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index aca70ba7874e..f1123a099308 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -27,6 +27,12 @@ Validation rules matches and differs
 Bugs have been fixed in the case where ``matches`` and ``differs`` in the Strict
 and Traditional rules validate data of non-string types.
 
+CURLRequest option 'ssl_key' eliminated
+====================================
+
+CURLRequest option 'ssl_key' was eliminated.
+Please use CURLRequest option 'verify' to indicate the path to a CA bundle.
+
 ***************
 Message Changes
 ***************

From 25b6d4022758a1b02be28ce4e7693202e3faaced Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Thu, 30 Nov 2023 17:57:03 +0000
Subject: [PATCH 222/380] Fix sphinx-action warning 'Title underline too short'

---
 user_guide_src/source/changelogs/v4.4.4.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index f1123a099308..39b74598c92f 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -28,7 +28,7 @@ Bugs have been fixed in the case where ``matches`` and ``differs`` in the Strict
 and Traditional rules validate data of non-string types.
 
 CURLRequest option 'ssl_key' eliminated
-====================================
+=======================================
 
 CURLRequest option 'ssl_key' was eliminated.
 Please use CURLRequest option 'verify' to indicate the path to a CA bundle.

From edd31c0971c68f4483df04b62a9f994798b3e308 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Dec 2023 15:12:27 +0900
Subject: [PATCH 223/380] chore: add missing ext-sodium in suggest

---
 admin/framework/composer.json | 1 +
 composer.json                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index f93daa275b1d..04b46a3b667c 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -43,6 +43,7 @@
         "ext-readline": "Improves CLI::input() usability",
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-simplexml": "If you format XML",
+        "ext-sodium": "If you Encryption SodiumHandler",
         "ext-sqlite3": "If you use SQLite3",
         "ext-sqlsrv": "If you use SQL Server",
         "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()"
diff --git a/composer.json b/composer.json
index 03008c6de3ca..98e5c32cf10d 100644
--- a/composer.json
+++ b/composer.json
@@ -52,6 +52,7 @@
         "ext-readline": "Improves CLI::input() usability",
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-simplexml": "If you format XML",
+        "ext-sodium": "If you Encryption SodiumHandler",
         "ext-sqlite3": "If you use SQLite3",
         "ext-sqlsrv": "If you use SQL Server",
         "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()"

From ab25092599263f316fe7b185bf08053e55b2ea83 Mon Sep 17 00:00:00 2001
From: IOTU Nicolae <nicolae.g.iotu@gmail.com>
Date: Fri, 1 Dec 2023 07:17:56 +0000
Subject: [PATCH 224/380] Update user_guide_src/source/changelogs/v4.4.4.rst

Co-authored-by: Michal Sniatala <michal@sniatala.pl>
---
 user_guide_src/source/changelogs/v4.4.4.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index 39b74598c92f..98415f303990 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -27,11 +27,11 @@ Validation rules matches and differs
 Bugs have been fixed in the case where ``matches`` and ``differs`` in the Strict
 and Traditional rules validate data of non-string types.
 
-CURLRequest option 'ssl_key' eliminated
-=======================================
+The use of the `ssl_key` option in CURLRequest was removed
+==========================================================
 
-CURLRequest option 'ssl_key' was eliminated.
-Please use CURLRequest option 'verify' to indicate the path to a CA bundle.
+Due to a bug, we were using the undocumented `ssl_key` config option to define the CA bundle in CURLRequest.
+This was fixed and is now working according to documentation. You can define your CA bundle via the `verify` option.
 
 ***************
 Message Changes

From 6df07b00acba0379440270feffb9c14c4fd66623 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Fri, 1 Dec 2023 07:39:46 +0000
Subject: [PATCH 225/380] Added the summary of the bug

---
 user_guide_src/source/changelogs/v4.4.4.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index 98415f303990..7ee96a53556f 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -55,6 +55,8 @@ Deprecations
 Bugs Fixed
 **********
 
+- **CURLRequest:** Fixed a bug where the hostname was checked even if options 'verify' was set to *false*.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.

From bfb9ab4ef7dcaf43bd9ce1ca0f091e2935a39b33 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Fri, 1 Dec 2023 07:51:44 +0000
Subject: [PATCH 226/380] Revert manual changes to CHANGELOG.md

---
 CHANGELOG.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dbee6dba64c..9cf10b0f8372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,5 @@
 # Changelog
 
-## [v4.4.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.4) (Unreleased)
-[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.3...v4.4.4)
-
-### Fixed Bugs
-
-* fix: [CURLRequest] skip hostname checks if options 'verify' false by @NicolaeIotu in https://github.com/codeigniter4/CodeIgniter4/pull/8258
-
 ## [v4.4.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.3) (2023-10-26)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.2...v4.4.3)
 

From 5b4482c86dd7b50af8c67901095bda7f9fc20979 Mon Sep 17 00:00:00 2001
From: Nicolae Iotu <nicolae.g.iotu@gmail.com>
Date: Fri, 1 Dec 2023 08:58:51 +0000
Subject: [PATCH 227/380] Added upgrading instructions

---
 user_guide_src/source/installation/upgrade_444.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_444.rst b/user_guide_src/source/installation/upgrade_444.rst
index b3773947efd9..77026be6673e 100644
--- a/user_guide_src/source/installation/upgrade_444.rst
+++ b/user_guide_src/source/installation/upgrade_444.rst
@@ -50,6 +50,15 @@ changed (fixed).
 Note that Traditional Rules should not be used to validate data that is not a
 string.
 
+The use of the `ssl_key` option in CURLRequest was removed
+==========================================================
+
+CURLRequest option `ssl_key` it's not recognized anymore.
+If in use, option `ssl_key` must be replaced with option `verify` in order to define the path
+to a CA bundle for CURLRequest.
+
+CURLRequest option `verify` can also take *boolean* values as usual.
+
 *********************
 Breaking Enhancements
 *********************

From 2ee497943d2eb32e7dedaf25ac97be5a0c1a8ded Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Dec 2023 17:42:04 +0900
Subject: [PATCH 228/380] test: add test for Model and Entity with cast
 primaryKey

---
 tests/_support/Entity/Cast/CastUUID.php | 43 +++++++++++++++++++++++++
 tests/_support/Entity/UUID.php          | 25 ++++++++++++++
 tests/_support/Models/UUIDPkeyModel.php | 25 ++++++++++++++
 tests/system/Models/UpdateModelTest.php | 36 +++++++++++++++++++++
 4 files changed, 129 insertions(+)
 create mode 100644 tests/_support/Entity/Cast/CastUUID.php
 create mode 100644 tests/_support/Entity/UUID.php
 create mode 100644 tests/_support/Models/UUIDPkeyModel.php

diff --git a/tests/_support/Entity/Cast/CastUUID.php b/tests/_support/Entity/Cast/CastUUID.php
new file mode 100644
index 000000000000..42cbb23b2670
--- /dev/null
+++ b/tests/_support/Entity/Cast/CastUUID.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Entity\Cast;
+
+use CodeIgniter\Entity\Cast\BaseCast;
+
+class CastUUID extends BaseCast
+{
+    /**
+     * Get
+     *
+     * @param string $binary Binary UUID
+     *
+     * @return string String UUID
+     */
+    public static function get($binary, array $params = []): string
+    {
+        $string = unpack('h*', $binary);
+
+        return preg_replace('/([0-9a-f]{8})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{12})/', '$1-$2-$3-$4-$5', $string[1]);
+    }
+
+    /**
+     * Set
+     *
+     * @param string $string String UUID
+     *
+     * @return string Binary UUID
+     */
+    public static function set($string, array $params = []): string
+    {
+        return pack('h*', str_replace('-', '', $string));
+    }
+}
diff --git a/tests/_support/Entity/UUID.php b/tests/_support/Entity/UUID.php
new file mode 100644
index 000000000000..1c124656458f
--- /dev/null
+++ b/tests/_support/Entity/UUID.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Entity;
+
+use CodeIgniter\Entity\Entity;
+use Tests\Support\Entity\Cast\CastUUID;
+
+class UUID extends Entity
+{
+    protected $casts = [
+        'id' => 'uuid',
+    ];
+    protected $castHandlers = [
+        'uuid' => CastUUID::class,
+    ];
+}
diff --git a/tests/_support/Models/UUIDPkeyModel.php b/tests/_support/Models/UUIDPkeyModel.php
new file mode 100644
index 000000000000..be4a3c750093
--- /dev/null
+++ b/tests/_support/Models/UUIDPkeyModel.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
+
+use CodeIgniter\Model;
+use Tests\Support\Entity\UUID;
+
+class UUIDPkeyModel extends Model
+{
+    protected $table            = 'uuid';
+    protected $useAutoIncrement = false;
+    protected $returnType       = UUID::class;
+    protected $allowedFields    = [
+        'value',
+    ];
+}
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 78ee2c945631..c18a30f7fc9a 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -14,12 +14,15 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Entity\Entity;
+use Config\Database;
 use InvalidArgumentException;
 use stdClass;
+use Tests\Support\Entity\UUID;
 use Tests\Support\Models\EventModel;
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\SecondaryModel;
 use Tests\Support\Models\UserModel;
+use Tests\Support\Models\UUIDPkeyModel;
 use Tests\Support\Models\ValidModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
@@ -375,6 +378,39 @@ public function testUpdateWithEntityNoAllowedFields(): void
         $this->model->update($id, $entity);
     }
 
+    public function testUpdateEntityWithPrimaryKeyCast(): void
+    {
+        $this->createUuidTable();
+
+        $this->createModel(UUIDPkeyModel::class);
+
+        $entity        = new UUID();
+        $entity->id    = '550e8400-e29b-41d4-a716-446655440000';
+        $entity->value = 'test1';
+
+        $id     = $this->model->insert($entity);
+        $entity = $this->model->find($id);
+
+        $entity->value = 'id';
+        $result        = $this->model->save($entity);
+
+        $this->assertTrue($result);
+
+        $entity = $this->model->find($id);
+
+        $this->assertSame('id', $entity->value);
+    }
+
+    private function createUuidTable(): void
+    {
+        $forge = Database::forge($this->DBGroup);
+        $forge->dropTable('uuid', true);
+        $forge->addField([
+            'id'    => ['type' => 'BINARY', 'constraint' => 16],
+            'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
+        ])->addKey('id', true)->createTable('uuid', true);
+    }
+
     public function testUseAutoIncrementSetToFalseUpdate(): void
     {
         $key = 'key';

From b8330e904ac467fff90d4b4e82640ab5dfa1c52b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Dec 2023 18:58:12 +0900
Subject: [PATCH 229/380] fix: processing in Model of Entity for which primary
 key is cast

---
 system/Model.php | 47 ++++++++++++++++-------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/system/Model.php b/system/Model.php
index 3a055531cb5b..0a8cd9dbec59 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -534,6 +534,21 @@ protected function idValue($data)
     public function getIdValue($data)
     {
         if (is_object($data) && isset($data->{$this->primaryKey})) {
+            // Get the raw primary key value of the Entity.
+            if ($data instanceof Entity) {
+                $cast = $data->cast();
+
+                // Disable Entity casting, because raw primary key value is needed for database.
+                $data->cast(false);
+
+                $primaryKey = $data->{$this->primaryKey};
+
+                // Restore Entity casting setting.
+                $data->cast($cast);
+
+                return $primaryKey;
+            }
+
             return $data->{$this->primaryKey};
         }
 
@@ -796,37 +811,7 @@ public function update($id = null, $data = null): bool
      */
     protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
     {
-        $properties = parent::objectToRawArray($data, $onlyChanged);
-
-        $primaryKey = null;
-
-        if ($data instanceof Entity) {
-            $cast = $data->cast();
-
-            // Disable Entity casting, because raw primary key data is needed for database.
-            $data->cast(false);
-
-            $primaryKey = $data->{$this->primaryKey};
-
-            // Restore Entity casting setting.
-            $data->cast($cast);
-        }
-
-        // Always grab the primary key otherwise updates will fail.
-        if (
-            // @TODO Should use `$data instanceof Entity`.
-            method_exists($data, 'toRawArray')
-            && (
-                ! empty($properties)
-                && ! empty($this->primaryKey)
-                && ! in_array($this->primaryKey, $properties, true)
-                && ! empty($primaryKey)
-            )
-        ) {
-            $properties[$this->primaryKey] = $primaryKey;
-        }
-
-        return $properties;
+        return parent::objectToRawArray($data, $onlyChanged);
     }
 
     /**

From 7f7be9a2ed59f4c5ab48805f83222182c2ce510e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Dec 2023 19:05:58 +0900
Subject: [PATCH 230/380] chore: update phpstan-baseline

---
 phpstan-baseline.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 1322685d6fd2..039eedaaccdc 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -2608,7 +2608,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 21,
+	'count' => 18,
 	'path' => __DIR__ . '/system/Model.php',
 ];
 $ignoreErrors[] = [

From c0a86fd6424938b506257e9f739b992853817125 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Dec 2023 06:53:59 +0900
Subject: [PATCH 231/380] test: skip test on OCI8, Postgre, SQLSRV

---
 tests/system/Models/UpdateModelTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index c18a30f7fc9a..89d3768dc8d1 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -380,6 +380,14 @@ public function testUpdateWithEntityNoAllowedFields(): void
 
     public function testUpdateEntityWithPrimaryKeyCast(): void
     {
+        if (
+            $this->db->DBDriver === 'OCI8'
+            || $this->db->DBDriver === 'Postgre'
+            || $this->db->DBDriver === 'SQLSRV'
+        ) {
+            $this->markTestSkipped($this->db->DBDriver . ' does not work with binary data as string data.');
+        }
+
         $this->createUuidTable();
 
         $this->createModel(UUIDPkeyModel::class);

From 87a706ca6a228d074488629c596b66d63df993c3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Dec 2023 07:23:51 +0900
Subject: [PATCH 232/380] test: skip SQLite3

SQLite3::escapeString() is not binary safe.
https://www.php.net/manual/en/sqlite3.escapestring.php
---
 tests/system/Models/UpdateModelTest.php | 46 +++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 89d3768dc8d1..0a2013b52a49 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -384,6 +384,7 @@ public function testUpdateEntityWithPrimaryKeyCast(): void
             $this->db->DBDriver === 'OCI8'
             || $this->db->DBDriver === 'Postgre'
             || $this->db->DBDriver === 'SQLSRV'
+            || $this->db->DBDriver === 'SQLite3'
         ) {
             $this->markTestSkipped($this->db->DBDriver . ' does not work with binary data as string data.');
         }
@@ -409,6 +410,51 @@ public function testUpdateEntityWithPrimaryKeyCast(): void
         $this->assertSame('id', $entity->value);
     }
 
+    public function testUpdateBatchEntityWithPrimaryKeyCast(): void
+    {
+        if (
+            $this->db->DBDriver === 'OCI8'
+            || $this->db->DBDriver === 'Postgre'
+            || $this->db->DBDriver === 'SQLSRV'
+            || $this->db->DBDriver === 'SQLite3'
+        ) {
+            $this->markTestSkipped($this->db->DBDriver . ' does not work with binary data as string data.');
+        }
+
+        $this->createUuidTable();
+
+        $this->createModel(UUIDPkeyModel::class);
+
+        $entity1        = new UUID();
+        $entity1->id    = '550e8400-e29b-41d4-a716-446655440000';
+        $entity1->value = 'test1';
+        $id1            = $this->model->insert($entity1);
+
+        $entity2        = new UUID();
+        $entity2->id    = 'bd59cff1-7a24-dde5-ac10-7b929db6da8c';
+        $entity2->value = 'test2';
+        $id2            = $this->model->insert($entity2);
+
+        $entity1 = $this->model->find($id1);
+        $entity2 = $this->model->find($id2);
+
+        $entity1->value = 'update1';
+        $entity2->value = 'update2';
+
+        $data = [
+            $entity1,
+            $entity2,
+        ];
+        $this->model->updateBatch($data, 'id');
+
+        $this->seeInDatabase('uuid', [
+            'value' => 'update1',
+        ]);
+        $this->seeInDatabase('uuid', [
+            'value' => 'update2',
+        ]);
+    }
+
     private function createUuidTable(): void
     {
         $forge = Database::forge($this->DBGroup);

From c357e4c43889b5fde01ec60b46d8aaacfbe1bac3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Dec 2023 10:25:46 +0900
Subject: [PATCH 233/380] test: skip test for batchUpdate() that does not work

---
 tests/system/Models/UpdateModelTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 0a2013b52a49..4e30763a4073 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -421,6 +421,11 @@ public function testUpdateBatchEntityWithPrimaryKeyCast(): void
             $this->markTestSkipped($this->db->DBDriver . ' does not work with binary data as string data.');
         }
 
+        // See https://github.com/codeigniter4/CodeIgniter4/pull/8282#issuecomment-1836974182
+        $this->markTestSkipped(
+            'batchUpdate() is currently not working due to data type issues in the generated SQL statement.'
+        );
+
         $this->createUuidTable();
 
         $this->createModel(UUIDPkeyModel::class);

From 6df976b54556405873909a19d6d89b6d06294644 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Dec 2023 18:52:17 +0900
Subject: [PATCH 234/380] test: fix test Entity name

---
 .../_support/Entity/Cast/{CastUUID.php => CastBinaryUUID.php} | 2 +-
 tests/_support/Entity/UUID.php                                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/_support/Entity/Cast/{CastUUID.php => CastBinaryUUID.php} (96%)

diff --git a/tests/_support/Entity/Cast/CastUUID.php b/tests/_support/Entity/Cast/CastBinaryUUID.php
similarity index 96%
rename from tests/_support/Entity/Cast/CastUUID.php
rename to tests/_support/Entity/Cast/CastBinaryUUID.php
index 42cbb23b2670..ddf5a80c202f 100644
--- a/tests/_support/Entity/Cast/CastUUID.php
+++ b/tests/_support/Entity/Cast/CastBinaryUUID.php
@@ -13,7 +13,7 @@
 
 use CodeIgniter\Entity\Cast\BaseCast;
 
-class CastUUID extends BaseCast
+class CastBinaryUUID extends BaseCast
 {
     /**
      * Get
diff --git a/tests/_support/Entity/UUID.php b/tests/_support/Entity/UUID.php
index 1c124656458f..d88fa25505f9 100644
--- a/tests/_support/Entity/UUID.php
+++ b/tests/_support/Entity/UUID.php
@@ -12,7 +12,7 @@
 namespace Tests\Support\Entity;
 
 use CodeIgniter\Entity\Entity;
-use Tests\Support\Entity\Cast\CastUUID;
+use Tests\Support\Entity\Cast\CastBinaryUUID;
 
 class UUID extends Entity
 {
@@ -20,6 +20,6 @@ class UUID extends Entity
         'id' => 'uuid',
     ];
     protected $castHandlers = [
-        'uuid' => CastUUID::class,
+        'uuid' => CastBinaryUUID::class,
     ];
 }

From b1b7d169d523106159970d95765375b017a3b512 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Dec 2023 05:36:02 +0900
Subject: [PATCH 235/380] docs: add missing "use"

Co-authored-by: MGatner <mgatner@icloud.com>
---
 admin/framework/composer.json | 2 +-
 composer.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 04b46a3b667c..245091e5d256 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -43,7 +43,7 @@
         "ext-readline": "Improves CLI::input() usability",
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-simplexml": "If you format XML",
-        "ext-sodium": "If you Encryption SodiumHandler",
+        "ext-sodium": "If you use Encryption SodiumHandler",
         "ext-sqlite3": "If you use SQLite3",
         "ext-sqlsrv": "If you use SQL Server",
         "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()"
diff --git a/composer.json b/composer.json
index 98e5c32cf10d..99a7dc676d56 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
         "ext-readline": "Improves CLI::input() usability",
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-simplexml": "If you format XML",
-        "ext-sodium": "If you Encryption SodiumHandler",
+        "ext-sodium": "If you use Encryption SodiumHandler",
         "ext-sqlite3": "If you use SQLite3",
         "ext-sqlsrv": "If you use SQL Server",
         "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()"

From 67335ecd4900a4da64ff8f27763cd123de0dc6ab Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Dec 2023 10:07:24 +0900
Subject: [PATCH 236/380] style: composer cs-fix

---
 system/Debug/BaseExceptionHandler.php | 2 +-
 system/Debug/Exceptions.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index 8b67d2153f9f..d4f045797366 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -239,7 +239,7 @@ protected function render(Throwable $exception, int $statusCode, $viewFile = nul
             exit(1);
         }
 
-        echo(function () use ($exception, $statusCode, $viewFile): string {
+        echo (function () use ($exception, $statusCode, $viewFile): string {
             $vars = $this->collectVars($exception, $statusCode);
             extract($vars, EXTR_SKIP);
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 4b3e5cf3ea3e..145474c6c633 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -316,7 +316,7 @@ protected function render(Throwable $exception, int $statusCode)
             exit(1);
         }
 
-        echo(function () use ($exception, $statusCode, $viewFile): string {
+        echo (function () use ($exception, $statusCode, $viewFile): string {
             $vars = $this->collectVars($exception, $statusCode);
             extract($vars, EXTR_SKIP);
 

From 705a695119e5e9418904be8f86cd7e72be1addf9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:40:52 +0000
Subject: [PATCH 237/380] chore(deps-dev): update rector/rector requirement

Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](https://github.com/rectorphp/rector/compare/0.18.11...0.18.12)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 03008c6de3ca..4cdf0137b36a 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.11",
+        "rector/rector": "0.18.12",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

From 37a0406fe300055c6c6f431e111a017c741a9647 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Dec 2023 06:10:46 +0900
Subject: [PATCH 238/380] test: fix UndefinedVariable

Error: tests/system/Test/TestCaseTest.php:57:56: UndefinedVariable: Cannot find referenced variable $result (see https://psalm.dev/024)
---
 tests/system/Test/TestCaseTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index e5e1ed8cb3f6..2bb19999de39 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -54,6 +54,8 @@ public function testAssertLogContains(): void
 
     public function testEventTriggering(): void
     {
+        $result = '';
+
         Events::on('foo', static function ($arg) use (&$result): void {
             $result = $arg;
         });
@@ -61,6 +63,7 @@ public function testEventTriggering(): void
         Events::trigger('foo', 'bar');
 
         $this->assertEventTriggered('foo');
+        $this->assertSame('bar', $result);
     }
 
     public function testStreamFilter(): void

From 8dae2a8f20a873d0d68b5c2fa2fac64a899707fd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Dec 2023 06:17:37 +0900
Subject: [PATCH 239/380] test: move class in TestCase file

$ vendor/bin/phpunit tests/system/Test/TestCaseTest.php
PHPUnit 9.6.15 by Sebastian Bergmann and contributors.

Runtime:       PHP 8.1.26
Configuration: /.../CodeIgniter4/phpunit.xml

E........                                                                                                 9 / 9 (100%)

Time: 00:00.086, Memory: 16.00 MB

There was 1 error:

1) CodeIgniter\Test\TestCaseTest::testGetPrivatePropertyWithObject
Error: Class "CodeIgniter\Test\__TestForReflectionHelper" not found

/.../CodeIgniter4/tests/system/Test/TestCaseTest.php:38

ERRORS!
Tests: 9, Assertions: 19, Errors: 1.
---
 .../_support/Test/TestForReflectionHelper.php | 38 ++++++++++++++++
 tests/system/Test/ReflectionHelperTest.php    | 44 +++++--------------
 tests/system/Test/TestCaseTest.php            |  3 +-
 3 files changed, 50 insertions(+), 35 deletions(-)
 create mode 100644 tests/_support/Test/TestForReflectionHelper.php

diff --git a/tests/_support/Test/TestForReflectionHelper.php b/tests/_support/Test/TestForReflectionHelper.php
new file mode 100644
index 000000000000..6ea9bea597cd
--- /dev/null
+++ b/tests/_support/Test/TestForReflectionHelper.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Test;
+
+class TestForReflectionHelper
+{
+    private string $private               = 'secret';
+    private static string $static_private = 'xyz';
+
+    public function getPrivate()
+    {
+        return $this->private;
+    }
+
+    public static function getStaticPrivate()
+    {
+        return self::$static_private;
+    }
+
+    private function privateMethod($param1, $param2)
+    {
+        return 'private ' . $param1 . $param2;
+    }
+
+    private static function privateStaticMethod($param1, $param2)
+    {
+        return 'private_static ' . $param1 . $param2;
+    }
+}
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index 414053b26dc1..86eb65ffbf51 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Test;
 
+use Tests\Support\Test\TestForReflectionHelper;
+
 /**
  * @internal
  *
@@ -20,14 +22,14 @@ final class ReflectionHelperTest extends CIUnitTestCase
 {
     public function testGetPrivatePropertyWithObject(): void
     {
-        $obj    = new __TestForReflectionHelper();
+        $obj    = new TestForReflectionHelper();
         $actual = $this->getPrivateProperty($obj, 'private');
         $this->assertSame('secret', $actual);
     }
 
     public function testGetPrivatePropertyWithObjectStaticCall(): void
     {
-        $obj    = new __TestForReflectionHelper();
+        $obj    = new TestForReflectionHelper();
         $actual = CIUnitTestCase::getPrivateProperty($obj, 'private');
         $this->assertSame('secret', $actual);
     }
@@ -35,7 +37,7 @@ public function testGetPrivatePropertyWithObjectStaticCall(): void
     public function testGetPrivatePropertyWithStatic(): void
     {
         $actual = $this->getPrivateProperty(
-            __TestForReflectionHelper::class,
+            TestForReflectionHelper::class,
             'static_private'
         );
         $this->assertSame('xyz', $actual);
@@ -43,7 +45,7 @@ public function testGetPrivatePropertyWithStatic(): void
 
     public function testSetPrivatePropertyWithObject(): void
     {
-        $obj = new __TestForReflectionHelper();
+        $obj = new TestForReflectionHelper();
         $this->setPrivateProperty(
             $obj,
             'private',
@@ -55,19 +57,19 @@ public function testSetPrivatePropertyWithObject(): void
     public function testSetPrivatePropertyWithStatic(): void
     {
         $this->setPrivateProperty(
-            __TestForReflectionHelper::class,
+            TestForReflectionHelper::class,
             'static_private',
             'abc'
         );
         $this->assertSame(
             'abc',
-            __TestForReflectionHelper::getStaticPrivate()
+            TestForReflectionHelper::getStaticPrivate()
         );
     }
 
     public function testGetPrivateMethodInvokerWithObject(): void
     {
-        $obj    = new __TestForReflectionHelper();
+        $obj    = new TestForReflectionHelper();
         $method = $this->getPrivateMethodInvoker(
             $obj,
             'privateMethod'
@@ -81,7 +83,7 @@ public function testGetPrivateMethodInvokerWithObject(): void
     public function testGetPrivateMethodInvokerWithStatic(): void
     {
         $method = $this->getPrivateMethodInvoker(
-            __TestForReflectionHelper::class,
+            TestForReflectionHelper::class,
             'privateStaticMethod'
         );
         $this->assertSame(
@@ -90,29 +92,3 @@ public function testGetPrivateMethodInvokerWithStatic(): void
         );
     }
 }
-
-class __TestForReflectionHelper
-{
-    private string $private               = 'secret';
-    private static string $static_private = 'xyz';
-
-    public function getPrivate()
-    {
-        return $this->private;
-    }
-
-    public static function getStaticPrivate()
-    {
-        return self::$static_private;
-    }
-
-    private function privateMethod($param1, $param2)
-    {
-        return 'private ' . $param1 . $param2;
-    }
-
-    private static function privateStaticMethod($param1, $param2)
-    {
-        return 'private_static ' . $param1 . $param2;
-    }
-}
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index 2bb19999de39..ea71ddd0ac48 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\Response;
 use Config\App;
+use Tests\Support\Test\TestForReflectionHelper;
 
 /**
  * @internal
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     public function testGetPrivatePropertyWithObject(): void
     {
-        $obj    = new __TestForReflectionHelper();
+        $obj    = new TestForReflectionHelper();
         $actual = $this->getPrivateProperty($obj, 'private');
         $this->assertSame('secret', $actual);
     }

From 66ea5298f04a117bd9aefed7df7d6f731f0950e4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 08:02:07 +0900
Subject: [PATCH 240/380] docs: remove space

---
 user_guide_src/source/libraries/validation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index ff449c9e6fb9..1eb0a6873da3 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -222,7 +222,7 @@ Traditional Rules
 -----------------
 
 .. important:: Traditional Rules exist only for backward compatibility. Do not
-    use them in new projects. Even if you are already using them, we recommend 
+    use them in new projects. Even if you are already using them, we recommend
     switching to Strict Rules.
 
 .. warning:: When validating data that contains non-string values, such as JSON data, it is recommended to use **Strict Rules**.

From 330b27674e62a4acf4cc481109f0d121a08e109a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 08:02:18 +0900
Subject: [PATCH 241/380] docs: improve description

---
 user_guide_src/source/libraries/validation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 1eb0a6873da3..497a682d5f0a 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -525,7 +525,7 @@ replaced by the **value** of the matched incoming field. An example should clari
    :lines: 2-
 
 .. note:: Since v4.3.5, you must set the validation rules for the placeholder
-    field (``id``).
+    field (the ``id`` field in the sample code above) for security.
 
 In this set of rules, it states that the email address should be unique in the database, except for the row
 that has an id matching the placeholder's value. Assuming that the form POST data had the following:

From ad92ce63280df258af8bee1155333da09a95d400 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:47:12 +0900
Subject: [PATCH 242/380] docs: add note for http_errors

---
 user_guide_src/source/libraries/curlrequest.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index ebfd1934c88f..d2beda913f41 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -83,6 +83,10 @@ a Response instance to you. This takes the HTTP method, the url and an array of
 
 .. literalinclude:: curlrequest/005.php
 
+.. important:: By default, CURLRequest will throw ``HTTPException`` if the HTTP
+    code returned is greater than or equal to 400. If you want to get the response,
+    see the `http_errors`_ option.
+
 .. note:: When ``$shareOptions`` is false, the options passed to the method will be used for the request. After sending the request, they will be cleared. If you want to use the options to all requests, pass the options in the constructor.
 
 Since the response is an instance of ``CodeIgniter\HTTP\Response`` you have all of the normal information

From 625db4b99c39dce0643405192e9e245785c1d12a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:53:17 +0900
Subject: [PATCH 243/380] docs: remove itailc

---
 user_guide_src/source/libraries/curlrequest.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index d2beda913f41..bc2a7e3ab36a 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -116,12 +116,12 @@ examples of how the combinations are resolved.
     =====================   ================   ========================
     baseURI                 URI                Result
     =====================   ================   ========================
-    `http://foo.com`        /bar               `http://foo.com/bar`
-    `http://foo.com/foo`    /bar               `http://foo.com/bar`
-    `http://foo.com/foo`    bar                `http://foo.com/bar`
-    `http://foo.com/foo/`   bar                `http://foo.com/foo/bar`
-    `http://foo.com`        `http://baz.com`   `http://baz.com`
-    `http://foo.com/?bar`   bar                `http://foo.com/bar`
+    \http://foo.com         /bar               \http://foo.com/bar
+    \http://foo.com/foo     /bar               \http://foo.com/bar
+    \http://foo.com/foo     bar                \http://foo.com/bar
+    \http://foo.com/foo/    bar                \http://foo.com/foo/bar
+    \http://foo.com         \http://baz.com    \http://baz.com
+    \http://foo.com/?bar    bar                \http://foo.com/bar
     =====================   ================   ========================
 
 Using Responses

From b8166540b4f0a8b78459401fb029eb648da260b6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 10:32:14 +0900
Subject: [PATCH 244/380] docs: fix markdown

Tags can be used in markdown.
So PhpStorm did not render `<script>`.
---
 changelogs/CHANGELOG_4.3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelogs/CHANGELOG_4.3.md b/changelogs/CHANGELOG_4.3.md
index 94a007bcc8f6..d19e5c98994b 100644
--- a/changelogs/CHANGELOG_4.3.md
+++ b/changelogs/CHANGELOG_4.3.md
@@ -230,7 +230,7 @@
 * fix: ResponseInterface (1) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6556
 * Improve BaseConnection::getForeignKeyData() and Forge::addForeignKey() by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6468
 * Refactor BaseBuilder *Batch() Methods by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6536
-* refactor: remove `type="text/javascript"` in <script> tag by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6606
+* refactor: remove `type="text/javascript"` in `<script>` tag by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6606
 * fix: ResponseInterface (2) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6569
 * Add ability to set index names by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6552
 * fix: MessageInterface inheritance by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/6695

From f80710c36725f6dff7b04596592256ab6a404de2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 10:34:21 +0900
Subject: [PATCH 245/380] docs: fix incorrect link

---
 changelogs/CHANGELOG_4.3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelogs/CHANGELOG_4.3.md b/changelogs/CHANGELOG_4.3.md
index d19e5c98994b..fdeefbd5fde9 100644
--- a/changelogs/CHANGELOG_4.3.md
+++ b/changelogs/CHANGELOG_4.3.md
@@ -323,4 +323,4 @@
 * refactor: remove Workaround for Faker deprecation errors in PHP 8.2 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6987
 * refactor: to fix psalm error by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6999
 
-See [CHANGELOG_4.2.md](./changelogs/CHANGELOG_4.2.md)
+See [CHANGELOG_4.2.md](./CHANGELOG_4.2.md)

From 80e0c9dcec88f4918d9554e7707674dca9f8ef88 Mon Sep 17 00:00:00 2001
From: Cole Thorsen <959538+colethorsen@users.noreply.github.com>
Date: Thu, 16 Nov 2023 08:07:45 -0800
Subject: [PATCH 246/380] allow get_filenames to follow symlinks

---
 system/Helpers/filesystem_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 47c829bbc3c6..4e0e8b1532e9 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -209,7 +209,7 @@ function get_filenames(
 
         try {
             foreach (new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS),
+                new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS),
                 RecursiveIteratorIterator::SELF_FIRST
             ) as $name => $object) {
                 $basename = pathinfo($name, PATHINFO_BASENAME);

From 0e029b5986b66de50f19c88c7e4dfcc74c1fae76 Mon Sep 17 00:00:00 2001
From: Cole Thorsen <959538+colethorsen@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:11:36 -0800
Subject: [PATCH 247/380] docs

---
 user_guide_src/source/changelogs/v4.4.4.rst         | 6 ++++++
 user_guide_src/source/helpers/filesystem_helper.rst | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index 7ee96a53556f..582ee061e62c 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -33,6 +33,12 @@ The use of the `ssl_key` option in CURLRequest was removed
 Due to a bug, we were using the undocumented `ssl_key` config option to define the CA bundle in CURLRequest.
 This was fixed and is now working according to documentation. You can define your CA bundle via the `verify` option.
 
+Filesystem Helper
+====================================
+
+``get_filenames()`` now follows symlink folders, which it previously just returned
+without following.
+
 ***************
 Message Changes
 ***************
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index e122660959c5..8d7507304909 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -164,6 +164,8 @@ The following functions are available:
     the second parameter to 'relative' for relative paths or any other non-empty value for
     a full file path.
 
+    Prior to v4.4.4, due to a bug, this function did not follow symlink folders.
+
     Example:
 
     .. literalinclude:: filesystem_helper/010.php

From 11b06caed6537a53b19a78ea09e3dbc10e00101a Mon Sep 17 00:00:00 2001
From: Cole Thorsen <959538+colethorsen@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:28:22 -0800
Subject: [PATCH 248/380] Apply suggestions from code review

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/changelogs/v4.4.4.rst         | 2 +-
 user_guide_src/source/helpers/filesystem_helper.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index 582ee061e62c..1f5c8450aefa 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -36,7 +36,7 @@ This was fixed and is now working according to documentation. You can define you
 Filesystem Helper
 ====================================
 
-``get_filenames()`` now follows symlink folders, which it previously just returned
+:php:func:`get_filenames()` now follows symlink folders, which it previously just returned
 without following.
 
 ***************
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 8d7507304909..0d0cc031caff 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -164,7 +164,7 @@ The following functions are available:
     the second parameter to 'relative' for relative paths or any other non-empty value for
     a full file path.
 
-    Prior to v4.4.4, due to a bug, this function did not follow symlink folders.
+    .. note:: Prior to v4.4.4, due to a bug, this function did not follow symlink folders.
 
     Example:
 

From 681de6d336fe682313f86d3ca18407d78d5b9ae5 Mon Sep 17 00:00:00 2001
From: Cole Thorsen <959538+colethorsen@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:57:50 -0800
Subject: [PATCH 249/380] Update user_guide_src/source/changelogs/v4.4.4.rst

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/changelogs/v4.4.4.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index 1f5c8450aefa..599681b48e4a 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -34,7 +34,7 @@ Due to a bug, we were using the undocumented `ssl_key` config option to define t
 This was fixed and is now working according to documentation. You can define your CA bundle via the `verify` option.
 
 Filesystem Helper
-====================================
+=================
 
 :php:func:`get_filenames()` now follows symlink folders, which it previously just returned
 without following.

From 3b74ad02e4c56603992680e077d9bcc37212687c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 15:27:19 +0900
Subject: [PATCH 250/380] test: add test for get_filenames()

---
 tests/system/Helpers/FilesystemHelperTest.php | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index e92505cc8a91..987e11eb5dcb 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -396,6 +396,35 @@ public function testGetFilenamesFailure(): void
         $this->assertSame([], get_filenames(SUPPORTPATH . 'Files/shaker/'));
     }
 
+    public function testGetFilenamesWithSymlinks(): void
+    {
+        $targetDir = APPPATH . 'Language';
+        $linkDir   = APPPATH . 'Controllers/Language';
+        if (file_exists($linkDir)) {
+            unlink($linkDir);
+        }
+        symlink($targetDir, $linkDir);
+
+        $targetFile = APPPATH . 'Common.php';
+        $linkFile   = APPPATH . 'Controllers/Common.php';
+        if (file_exists($linkFile)) {
+            unlink($linkFile);
+        }
+        symlink($targetFile, $linkFile);
+
+        $this->assertSame([
+            0 => 'BaseController.php',
+            1 => 'Common.php',
+            2 => 'Home.php',
+            3 => 'Language',
+            4 => 'Validation.php',
+            5 => 'en',
+        ], get_filenames(APPPATH . 'Controllers'));
+
+        unlink($linkDir);
+        unlink($linkFile);
+    }
+
     public function testGetDirFileInfo(): void
     {
         $file = SUPPORTPATH . 'Files/baker/banana.php';

From 5307dbf2c7fdec56336d5aba8239431f76f7f607 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 08:42:38 +0900
Subject: [PATCH 251/380] docs: make helper names linkable

---
 user_guide_src/source/general/helpers.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 88accffd47b3..5bea71131935 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -10,11 +10,13 @@ Helper Functions
 What are Helpers?
 *****************
 
-Helpers, as the name suggests, help you with tasks. Each helper file is
-simply a collection of functions in a particular category. There are **URL
-Helpers**, that assist in creating links, there are **Form Helpers** that help
-you create form elements, **Text Helpers** perform various text formatting
-routines, **Cookie Helpers** set and read cookies, **File Helpers** help you
+Helpers, as the name suggests, help you with tasks. Each helper file is simply a
+collection of functions in a particular category. There are
+:doc:`URL Helpers <../helpers/url_helper>`,
+that assist in creating links, there are :doc:`Form Helpers <../helpers/form_helper>`
+that help you create form elements, :doc:`Test Helpers <../helpers/text_helper>`
+perform various text formatting routines,  :doc:`Cookie Helpers <../helpers/cookie_helper>`
+set and read cookies, :doc:`Filesystem Helpers <../helpers/filesystem_helper>` help you
 deal with files, etc.
 
 Unlike most other systems in CodeIgniter, Helpers are not written in an
@@ -50,7 +52,7 @@ extension or the "**_helper**" part.
     Therefore, ``helper('Name')`` will not work on case-sensitive file systems
     such as Linux.
 
-For example, to load the **Cookie Helper** file, which is named
+For example, to load the :doc:`../helpers/cookie_helper` file, which is named
 **cookie_helper.php**, you would do this:
 
 .. literalinclude:: helpers/002.php

From 3cd0559adf98e5d7774d5d1d09baea0a63b1a93b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 08:45:13 +0900
Subject: [PATCH 252/380] docs: simplify explanation

---
 user_guide_src/source/general/helpers.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 5bea71131935..771cb826ce53 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -45,8 +45,7 @@ Loading a helper file is quite simple using the following method:
 
 .. literalinclude:: helpers/001.php
 
-Where ``name`` is the file name of the helper, without the "**.php**" file
-extension or the "**_helper**" part.
+The above code loads the **name_helper.php** file.
 
 .. important:: CodeIgniter helper file names are all lowercase.
     Therefore, ``helper('Name')`` will not work on case-sensitive file systems

From c053f99a6bceab9b3ee5c27017019f44f863405d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:20:05 +0900
Subject: [PATCH 253/380] docs: add section title and explanation

---
 user_guide_src/source/general/helpers.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 771cb826ce53..d56215cfbe19 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -154,9 +154,15 @@ your view files you would do this:
 Where ``Click Here`` is the name of the link, and ``blog/comments`` is the
 URI to the controller/method you wish to link to.
 
-*******************
+****************
+Creating Helpers
+****************
+
+The helper filename is the **helper name** and **_helper.php**.
+For example, to create Email Helper, you’ll create a file named **app/Helpers/email_helper.php**.
+
 "Extending" Helpers
-*******************
+===================
 
 To "extend" Helpers, create a file in your **app/Helpers/** folder
 with an identical name to the existing Helper.

From 607e3232834dd592223c343a4b82b6de50e84e62 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:20:28 +0900
Subject: [PATCH 254/380] docs: remove / after folder name

---
 user_guide_src/source/general/helpers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index d56215cfbe19..ed99ad9e1db5 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -164,7 +164,7 @@ For example, to create Email Helper, you’ll create a file named **app/Helpers/
 "Extending" Helpers
 ===================
 
-To "extend" Helpers, create a file in your **app/Helpers/** folder
+To "extend" Helpers, create a file in your **app/Helpers** folder
 with an identical name to the existing Helper.
 
 If all you need to do is add some functionality to an existing helper -

From 082f294142f27632e5adec63069bbf19bc71a0be Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:20:46 +0900
Subject: [PATCH 255/380] docs: add period

---
 user_guide_src/source/general/helpers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index ed99ad9e1db5..19befd71afd1 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -192,7 +192,7 @@ is as follows:
 
 1. app/Helpers - Files loaded here are always loaded first.
 2. {namespace}/Helpers - All namespaces are looped through in the order they are defined.
-3. system/Helpers - The base file is loaded last
+3. system/Helpers - The base file is loaded last.
 
 *********
 Now What?

From e9812ff822bb21d5c6d7cbe6401db0a2da109717 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:21:05 +0900
Subject: [PATCH 256/380] docs: add empty line

---
 user_guide_src/source/general/helpers.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 19befd71afd1..f2d38f1ad892 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -187,8 +187,9 @@ functions:
 
 The :php:func:`helper()` function will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php**
 and load in ALL matching helpers of the same name. This allows any module's helpers
-to be loaded, as well as any helpers you've created specifically for this application. The load order
-is as follows:
+to be loaded, as well as any helpers you've created specifically for this application.
+
+The load order is as follows:
 
 1. app/Helpers - Files loaded here are always loaded first.
 2. {namespace}/Helpers - All namespaces are looped through in the order they are defined.

From 1836e24671dab3456c7dbf73fc5bc37c0f6a4de8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:30:03 +0900
Subject: [PATCH 257/380] docs: add line break

---
 user_guide_src/source/general/helpers.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index f2d38f1ad892..0105620b6a54 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -159,7 +159,8 @@ Creating Helpers
 ****************
 
 The helper filename is the **helper name** and **_helper.php**.
-For example, to create Email Helper, you’ll create a file named **app/Helpers/email_helper.php**.
+For example, to create Email Helper, you’ll create a file named
+**app/Helpers/email_helper.php**.
 
 "Extending" Helpers
 ===================

From adc23ac106d5d52fe7cddfdc56b5ff44c1207cb7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:30:19 +0900
Subject: [PATCH 258/380] docs: move "Load Order" section to "Loading a Helper"

---
 user_guide_src/source/general/helpers.rst | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 0105620b6a54..18afde64441d 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -76,6 +76,19 @@ for details.
 Or you can :ref:`specify a namespace <helpers-loading-from-specified-namespace>`
 for a helper that you want to load.
 
+Load Order
+----------
+
+The :php:func:`helper()` function will scan through all defined namespaces and
+load in ALL matching helpers of the same name. This allows any module's helpers
+to be loaded, as well as any helpers you've created specifically for this application.
+
+The load order is as follows:
+
+1. app/Helpers - Files loaded here are always loaded first.
+2. {namespace}/Helpers - All namespaces are looped through in the order they are defined.
+3. system/Helpers - The base file is loaded last.
+
 Loading Multiple Helpers
 ========================
 
@@ -186,15 +199,7 @@ functions:
 
 .. important:: Do not specify the namespace ``App\Helpers``.
 
-The :php:func:`helper()` function will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php**
-and load in ALL matching helpers of the same name. This allows any module's helpers
-to be loaded, as well as any helpers you've created specifically for this application.
-
-The load order is as follows:
-
-1. app/Helpers - Files loaded here are always loaded first.
-2. {namespace}/Helpers - All namespaces are looped through in the order they are defined.
-3. system/Helpers - The base file is loaded last.
+See `Load Order`_ for the order in which helper files are loaded.
 
 *********
 Now What?

From 3c7d31afe091ab194a0f21397f8f80195bfee1fd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:31:51 +0900
Subject: [PATCH 259/380] docs: make helper names linkable

---
 user_guide_src/source/general/helpers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 18afde64441d..b5232d053146 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -36,7 +36,7 @@ Helpers are typically stored in your **system/Helpers**, or
 Loading Helpers
 ***************
 
-.. note:: The URL helper is always loaded so you do not need to load it yourself.
+.. note:: The :doc:`../helpers/url_helper` is always loaded so you do not need to load it yourself.
 
 Loading a Helper
 ================

From 26f61996a82f3478641d03497278aa8bb6ee96be Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:33:24 +0900
Subject: [PATCH 260/380] docs: update description

It is not a method, but a function.
---
 user_guide_src/source/general/helpers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index b5232d053146..ca8cf81b2db1 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -56,7 +56,7 @@ For example, to load the :doc:`../helpers/cookie_helper` file, which is named
 
 .. literalinclude:: helpers/002.php
 
-.. note:: The Helper loading method above does not return a value, so
+.. note:: The :php:func:`helper()` function does not return a value, so
     don't try to assign it to a variable. Just use it as shown.
 
 Auto-Discovery and Composer Packages

From e359bc7b30cf9c50865a9df89bfdd155e0e281e6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 09:40:56 +0900
Subject: [PATCH 261/380] docs: improve explanation

---
 user_guide_src/source/general/helpers.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index ca8cf81b2db1..978c2bcb984b 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -117,12 +117,13 @@ property in Controller instead. See :ref:`Controllers <controllers-helpers>`.
 Loading from Specified Namespace
 ================================
 
-Helpers can be loaded from directories outside of **app/Helpers** and
-**system/Helpers**, as long as that path can be found in defined namespaces.
+By default, CodeIgniter will search for the helper files in all defined namespaces
+and load all found files.
 
-You would prefix the name of the Helper with the namespace that it can be located
-in. Within that namespaced directory, the loader expects it to live within a
-sub-directory named **Helpers**. An example will help understand this.
+If you want to load only a helper in a specific namespace, prefix the name of the
+helper with the namespace that it can be located in. Within that namespaced directory,
+the loader expects it to live within a sub-directory named **Helpers**. An example
+will help understand this.
 
 For this example, assume that we have grouped together all of our Blog-related
 code into its own namespace, ``Example\Blog``. The files exist on our server at

From 4ea4e8656565878a201ad4449bd236ccb4c8df94 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 20:08:09 +0900
Subject: [PATCH 262/380] docs: add "Creating Custom Helpers" and sample code

---
 user_guide_src/source/general/helpers.rst     | 12 ++++++++++--
 user_guide_src/source/general/helpers/008.php | 11 +++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 user_guide_src/source/general/helpers/008.php

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 978c2bcb984b..178744f82368 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -172,9 +172,17 @@ URI to the controller/method you wish to link to.
 Creating Helpers
 ****************
 
+Creating Custom Helpers
+=======================
+
 The helper filename is the **helper name** and **_helper.php**.
-For example, to create Email Helper, you’ll create a file named
-**app/Helpers/email_helper.php**.
+
+For example, to create info helper, you’ll create a file named
+**app/Helpers/info_helper.php**, and add a function to the file:
+
+.. literalinclude:: helpers/008.php
+
+You can add as many functions as you like to a single helper file.
 
 "Extending" Helpers
 ===================
diff --git a/user_guide_src/source/general/helpers/008.php b/user_guide_src/source/general/helpers/008.php
new file mode 100644
index 000000000000..e129a39ef2e6
--- /dev/null
+++ b/user_guide_src/source/general/helpers/008.php
@@ -0,0 +1,11 @@
+<?php
+
+// app/Helpers/info_helper.php
+
+/**
+ * Returns CodeIgniter's version.
+ */
+function ci_version(): string
+{
+    return CodeIgniter::CI_VERSION;
+}

From 93da70029efe6f0e3130cd7f4ae43d8b86bd1699 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Dec 2023 20:27:00 +0900
Subject: [PATCH 263/380] docs: fix sample code

---
 user_guide_src/source/general/helpers/008.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/general/helpers/008.php b/user_guide_src/source/general/helpers/008.php
index e129a39ef2e6..475b4dd85f1a 100644
--- a/user_guide_src/source/general/helpers/008.php
+++ b/user_guide_src/source/general/helpers/008.php
@@ -1,6 +1,7 @@
 <?php
 
 // app/Helpers/info_helper.php
+use CodeIgniter\CodeIgniter;
 
 /**
  * Returns CodeIgniter's version.

From cb4fe38d415de5d188dd8ca28e31e36183671391 Mon Sep 17 00:00:00 2001
From: woodong <woodongwong@gmail.com>
Date: Mon, 4 Dec 2023 14:58:33 +0800
Subject: [PATCH 264/380] fix: Handle non-array JSON in validation

---
 system/HTTP/Exceptions/HTTPException.php   | 11 +++++++++++
 system/Language/en/HTTP.php                |  1 +
 system/Validation/Validation.php           |  5 +++++
 tests/system/Validation/ValidationTest.php | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+)

diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index 32f9ceabd662..3fcfe73fa674 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -228,4 +228,15 @@ public static function forInvalidSameSiteSetting(string $samesite)
     {
         return new static(lang('Security.invalidSameSiteSetting', [$samesite]));
     }
+
+    /**
+     * Thrown when the JSON format is not supported.
+     * This is specifically for cases where data validation is expected to work with key-value structures.
+     *
+     * @return HTTPException
+     */
+    public static function forUnsupportedJSONFormat()
+    {
+        return new static(lang('HTTP.unsupportedJSONFormat'));
+    }
 }
diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php
index e9082f85d185..ee5ca4f81f46 100644
--- a/system/Language/en/HTTP.php
+++ b/system/Language/en/HTTP.php
@@ -20,6 +20,7 @@
     // IncomingRequest
     'invalidNegotiationType' => '"{0}" is not a valid negotiation type. Must be one of: media, charset, encoding, language.',
     'invalidJSON'            => 'Failed to parse JSON string. Error: {0}',
+    'unsupportedJSONFormat'  => 'The provided JSON format is not supported.',
 
     // Message
     'invalidHTTPProtocol' => 'Invalid HTTP Protocol Version: {0}',
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index b1612481b97b..f9bcc61bb511 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Validation;
 
 use Closure;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\Validation\Exceptions\ValidationException;
@@ -496,6 +497,10 @@ public function withRequest(RequestInterface $request): ValidationInterface
         if (strpos($request->getHeaderLine('Content-Type'), 'application/json') !== false) {
             $this->data = $request->getJSON(true);
 
+            if (! is_array($this->data)) {
+                throw HTTPException::forUnsupportedJSONFormat();
+            }
+
             return $this;
         }
 
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 889338a09f41..f7f87549087a 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -809,6 +809,25 @@ public function testJsonInputInvalid(): void
             ->run();
     }
 
+    public function testJsonInputNotKeyValue(): void
+    {
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage('The provided JSON format is not supported.');
+
+        $config  = new App();
+        $json    = '4';
+        $request = new IncomingRequest($config, new SiteURI($config), $json, new UserAgent());
+        $request->setHeader('Content-Type', 'application/json');
+
+        $rules = [
+            'role' => 'if_exist|max_length[5]',
+        ];
+        $this->validation
+            ->withRequest($request->withMethod('POST'))
+            ->setRules($rules)
+            ->run();
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/6466
      */

From e5c923e7e4e64a5d707afb5558456e09c33cfb97 Mon Sep 17 00:00:00 2001
From: woodong <woodongwong@gmail.com>
Date: Mon, 4 Dec 2023 15:00:50 +0800
Subject: [PATCH 265/380] docs: add changelog

---
 user_guide_src/source/changelogs/v4.4.4.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index 7ee96a53556f..ee2e41cb6135 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -38,6 +38,7 @@ Message Changes
 ***************
 
 - Added ``HTTP.invalidJSON`` error message.
+- Added ``HTTP.unsupportedJSONFormat`` error message.
 
 *******
 Changes

From 285f379da40e5ec8eb7768b6834f4ac2629f2132 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 16:41:06 +0900
Subject: [PATCH 266/380] docs: fix PHPDoc types

---
 system/BaseModel.php | 28 ++++++++++++++++------------
 system/Model.php     |  5 +++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 1d854256a63c..f37cfab1fa28 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -824,10 +824,11 @@ public function insert($data = null, bool $returnID = true)
     /**
      * Compiles batch insert runs the queries, validating each row prior.
      *
-     * @param array|null $set       an associative array of insert values
-     * @param bool|null  $escape    Whether to escape values
-     * @param int        $batchSize The size of the batch to run
-     * @param bool       $testing   True means only number of records is returned, false will execute the query
+     * @param list<array|object>|null $set an associative array of insert values
+     * @phpstan-param list<row_array|object>|null $set
+     * @param bool|null $escape    Whether to escape values
+     * @param int       $batchSize The size of the batch to run
+     * @param bool      $testing   True means only number of records is returned, false will execute the query
      *
      * @return bool|int Number of rows inserted or FALSE on failure
      *
@@ -912,6 +913,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
      *
      * @param array|int|string|null $id
      * @param array|object|null     $data
+     * @phpstan-param row_array|object|null $data
      *
      * @throws ReflectionException
      */
@@ -973,7 +975,8 @@ public function update($id = null, $data = null): bool
     /**
      * Compiles an update and runs the query.
      *
-     * @param array|null  $set       An associative array of update values
+     * @param list<array|object>|null $set an associative array of insert values
+     * @phpstan-param list<row_array|object>|null $set
      * @param string|null $index     The where key
      * @param int         $batchSize The size of the batch to run
      * @param bool        $returnSQL True means SQL is returned, false will execute the query
@@ -1656,9 +1659,9 @@ public function asObject(string $class = 'object')
      * This method uses objectToRawArray() internally and does conversion
      * to string on all Time instances
      *
-     * @param object|string $data        Data
-     * @param bool          $onlyChanged Only Changed Property
-     * @param bool          $recursive   If true, inner entities will be cast as array as well
+     * @param object|null $data        Data
+     * @param bool        $onlyChanged Only Changed Property
+     * @param bool        $recursive   If true, inner entities will be cast as array as well
      *
      * @return array Array
      *
@@ -1688,9 +1691,9 @@ protected function objectToArray($data, bool $onlyChanged = true, bool $recursiv
      * Takes a class and returns an array of its public and protected
      * properties as an array with raw values.
      *
-     * @param object|string $data        Data
-     * @param bool          $onlyChanged Only Changed Property
-     * @param bool          $recursive   If true, inner entities will be casted as array as well
+     * @param object|null $data        Data
+     * @param bool        $onlyChanged Only Changed Property
+     * @param bool        $recursive   If true, inner entities will be casted as array as well
      *
      * @return array|null Array
      *
@@ -1722,7 +1725,8 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
      * Transform data to array.
      *
      * @param array|object|null $data Data
-     * @param string            $type Type of data (insert|update)
+     * @phpstan-param row_array|object|null $data
+     * @param string $type Type of data (insert|update)
      *
      * @throws DataException
      * @throws InvalidArgumentException
diff --git a/system/Model.php b/system/Model.php
index 0a8cd9dbec59..a0dfe33dfafb 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -778,6 +778,7 @@ protected function doProtectFieldsForInsert(array $data): array
      *
      * @param array|int|string|null $id
      * @param array|object|null     $data
+     * @phpstan-param row_array|object|null $data
      *
      * @throws ReflectionException
      */
@@ -802,8 +803,8 @@ public function update($id = null, $data = null): bool
      * Takes a class and returns an array of its public and protected
      * properties as an array with raw values.
      *
-     * @param object|string $data
-     * @param bool          $recursive If true, inner entities will be cast as array as well
+     * @param object|null $data
+     * @param bool        $recursive If true, inner entities will be cast as array as well
      *
      * @return array|null Array
      *

From be70e74c4ea5259c9ea40b6521858780c1707f24 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 16:49:35 +0900
Subject: [PATCH 267/380] refactor: rename parameter name to $object

---
 system/BaseModel.php | 18 +++++++++---------
 system/Model.php     |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index f37cfab1fa28..d88af3c82557 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1659,7 +1659,7 @@ public function asObject(string $class = 'object')
      * This method uses objectToRawArray() internally and does conversion
      * to string on all Time instances
      *
-     * @param object|null $data        Data
+     * @param object|null $object      Object
      * @param bool        $onlyChanged Only Changed Property
      * @param bool        $recursive   If true, inner entities will be cast as array as well
      *
@@ -1667,9 +1667,9 @@ public function asObject(string $class = 'object')
      *
      * @throws ReflectionException
      */
-    protected function objectToArray($data, bool $onlyChanged = true, bool $recursive = false): array
+    protected function objectToArray($object, bool $onlyChanged = true, bool $recursive = false): array
     {
-        $properties = $this->objectToRawArray($data, $onlyChanged, $recursive);
+        $properties = $this->objectToRawArray($object, $onlyChanged, $recursive);
 
         assert(is_array($properties));
 
@@ -1691,7 +1691,7 @@ protected function objectToArray($data, bool $onlyChanged = true, bool $recursiv
      * Takes a class and returns an array of its public and protected
      * properties as an array with raw values.
      *
-     * @param object|null $data        Data
+     * @param object|null $object      Object
      * @param bool        $onlyChanged Only Changed Property
      * @param bool        $recursive   If true, inner entities will be casted as array as well
      *
@@ -1699,12 +1699,12 @@ protected function objectToArray($data, bool $onlyChanged = true, bool $recursiv
      *
      * @throws ReflectionException
      */
-    protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
+    protected function objectToRawArray($object, bool $onlyChanged = true, bool $recursive = false): array
     {
-        if (method_exists($data, 'toRawArray')) {
-            $properties = $data->toRawArray($onlyChanged, $recursive);
+        if (method_exists($object, 'toRawArray')) {
+            $properties = $object->toRawArray($onlyChanged, $recursive);
         } else {
-            $mirror = new ReflectionClass($data);
+            $mirror = new ReflectionClass($object);
             $props  = $mirror->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
 
             $properties = [];
@@ -1714,7 +1714,7 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
             foreach ($props as $prop) {
                 // Must make protected values accessible.
                 $prop->setAccessible(true);
-                $properties[$prop->getName()] = $prop->getValue($data);
+                $properties[$prop->getName()] = $prop->getValue($object);
             }
         }
 
diff --git a/system/Model.php b/system/Model.php
index a0dfe33dfafb..ce821df9f77c 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -803,16 +803,16 @@ public function update($id = null, $data = null): bool
      * Takes a class and returns an array of its public and protected
      * properties as an array with raw values.
      *
-     * @param object|null $data
+     * @param object|null $object    Object
      * @param bool        $recursive If true, inner entities will be cast as array as well
      *
      * @return array|null Array
      *
      * @throws ReflectionException
      */
-    protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
+    protected function objectToRawArray($object, bool $onlyChanged = true, bool $recursive = false): array
     {
-        return parent::objectToRawArray($data, $onlyChanged);
+        return parent::objectToRawArray($object, $onlyChanged);
     }
 
     /**

From c602c4f67a7ce745e679fa84c366e260f2a4c128 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 17:29:31 +0900
Subject: [PATCH 268/380] docs: fix PHPDoc types

---
 system/BaseModel.php | 15 ++++++++-------
 system/Model.php     |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index d88af3c82557..bad60dc559b4 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1659,9 +1659,9 @@ public function asObject(string $class = 'object')
      * This method uses objectToRawArray() internally and does conversion
      * to string on all Time instances
      *
-     * @param object|null $object      Object
-     * @param bool        $onlyChanged Only Changed Property
-     * @param bool        $recursive   If true, inner entities will be cast as array as well
+     * @param object $object      Object
+     * @param bool   $onlyChanged Only Changed Property
+     * @param bool   $recursive   If true, inner entities will be cast as array as well
      *
      * @return array Array
      *
@@ -1691,16 +1691,17 @@ protected function objectToArray($object, bool $onlyChanged = true, bool $recurs
      * Takes a class and returns an array of its public and protected
      * properties as an array with raw values.
      *
-     * @param object|null $object      Object
-     * @param bool        $onlyChanged Only Changed Property
-     * @param bool        $recursive   If true, inner entities will be casted as array as well
+     * @param object $object      Object
+     * @param bool   $onlyChanged Only Changed Property
+     * @param bool   $recursive   If true, inner entities will be casted as array as well
      *
-     * @return array|null Array
+     * @return array<string, mixed>
      *
      * @throws ReflectionException
      */
     protected function objectToRawArray($object, bool $onlyChanged = true, bool $recursive = false): array
     {
+        // Entity::toRawArray() returns array.
         if (method_exists($object, 'toRawArray')) {
             $properties = $object->toRawArray($onlyChanged, $recursive);
         } else {
diff --git a/system/Model.php b/system/Model.php
index ce821df9f77c..c6dbf5c699d9 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -803,10 +803,10 @@ public function update($id = null, $data = null): bool
      * Takes a class and returns an array of its public and protected
      * properties as an array with raw values.
      *
-     * @param object|null $object    Object
-     * @param bool        $recursive If true, inner entities will be cast as array as well
+     * @param object $object    Object
+     * @param bool   $recursive If true, inner entities will be cast as array as well
      *
-     * @return array|null Array
+     * @return array<string, mixed>
      *
      * @throws ReflectionException
      */

From 512ba40c3b023c5648956ef82906cbc5c32905c6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 17:29:44 +0900
Subject: [PATCH 269/380] refactor: remove unneeded assert()

---
 system/BaseModel.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index bad60dc559b4..e71a73cbe789 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1671,8 +1671,6 @@ protected function objectToArray($object, bool $onlyChanged = true, bool $recurs
     {
         $properties = $this->objectToRawArray($object, $onlyChanged, $recursive);
 
-        assert(is_array($properties));
-
         // Convert any Time instances to appropriate $dateFormat
         if ($properties !== []) {
             $properties = array_map(function ($value) {

From 58fce8b8fff3775310ebc7d439adf14fbf1b1396 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 18:46:26 +0900
Subject: [PATCH 270/380] docs: fix PHPDoc types

---
 system/BaseModel.php | 2 +-
 system/Model.php     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index e71a73cbe789..06a78e3f2601 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1663,7 +1663,7 @@ public function asObject(string $class = 'object')
      * @param bool   $onlyChanged Only Changed Property
      * @param bool   $recursive   If true, inner entities will be cast as array as well
      *
-     * @return array Array
+     * @return array<string, mixed>
      *
      * @throws ReflectionException
      */
diff --git a/system/Model.php b/system/Model.php
index c6dbf5c699d9..deffa4a9a042 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -212,6 +212,7 @@ protected function doFind(bool $singleton, $id = null)
      * @param string $columnName Column Name
      *
      * @return array|null The resulting row of data, or null if no data found.
+     * @phpstan-return list<row_array>|null
      */
     protected function doFindColumn(string $columnName)
     {
@@ -715,7 +716,7 @@ protected function shouldUpdate($data): bool
      * @phpstan-param row_array|object|null $data
      * @param bool $returnID Whether insert ID should be returned or not.
      *
-     * @return false|int|object|string
+     * @return bool|int|string
      * @phpstan-return ($returnID is true ? int|string|false : bool)
      *
      * @throws ReflectionException

From c43037fba8a29d47da027dec2d3dfdceccf43c9c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Nov 2023 18:59:20 +0900
Subject: [PATCH 271/380] refactor: extract timeToString()

---
 system/BaseModel.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 06a78e3f2601..94f710d01fe1 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1672,17 +1672,29 @@ protected function objectToArray($object, bool $onlyChanged = true, bool $recurs
         $properties = $this->objectToRawArray($object, $onlyChanged, $recursive);
 
         // Convert any Time instances to appropriate $dateFormat
-        if ($properties !== []) {
-            $properties = array_map(function ($value) {
-                if ($value instanceof Time) {
-                    return $this->timeToDate($value);
-                }
+        return $this->timeToString($properties);
+    }
 
-                return $value;
-            }, $properties);
+    /**
+     * Convert any Time instances to appropriate $dateFormat.
+     *
+     * @param array<string, mixed> $properties
+     *
+     * @return array<string, mixed>
+     */
+    protected function timeToString(array $properties): array
+    {
+        if ($properties === []) {
+            return [];
         }
 
-        return $properties;
+        return array_map(function ($value) {
+            if ($value instanceof Time) {
+                return $this->timeToDate($value);
+            }
+
+            return $value;
+        }, $properties);
     }
 
     /**

From 6b77de2edb493d12ea7f2b8406c031328fa97c95 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Nov 2023 09:13:22 +0900
Subject: [PATCH 272/380] docs: add PHPDoc types

---
 system/BaseModel.php | 10 ++++++----
 system/Model.php     |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 94f710d01fe1..94fe410bfce7 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -478,8 +478,9 @@ abstract protected function doOnlyDeleted();
      * Compiles a replace and runs the query.
      * This method works only with dbCalls.
      *
-     * @param array|null $data      Data
-     * @param bool       $returnSQL Set to true to return Query String
+     * @param array|null $data Data
+     * @phpstan-param row_array|null $data
+     * @param bool $returnSQL Set to true to return Query String
      *
      * @return BaseResult|false|Query|string
      */
@@ -1151,8 +1152,9 @@ public function onlyDeleted()
     /**
      * Compiles a replace and runs the query.
      *
-     * @param array|null $data      Data
-     * @param bool       $returnSQL Set to true to return Query String
+     * @param array|null $data Data
+     * @phpstan-param row_array|null $data
+     * @param bool $returnSQL Set to true to return Query String
      *
      * @return BaseResult|false|Query|string
      */
diff --git a/system/Model.php b/system/Model.php
index deffa4a9a042..8d8645fa9572 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -481,8 +481,9 @@ protected function doOnlyDeleted()
      * Compiles a replace into string and runs the query
      * This method works only with dbCalls.
      *
-     * @param array|null $data      Data
-     * @param bool       $returnSQL Set to true to return Query String
+     * @param array|null $data Data
+     * @phpstan-param row_array|null $data
+     * @param bool $returnSQL Set to true to return Query String
      *
      * @return BaseResult|false|Query|string
      */

From 872beb905649cbdba9657f3973e1ce9e72abfed9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Nov 2023 09:15:18 +0900
Subject: [PATCH 273/380] refactor: fix non-boolean if condition

---
 system/BaseModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 94fe410bfce7..38f63c5f189a 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1161,7 +1161,7 @@ public function onlyDeleted()
     public function replace(?array $data = null, bool $returnSQL = false)
     {
         // Validate data before saving.
-        if ($data && ! $this->skipValidation && ! $this->validate($data)) {
+        if (($data !== null) && ! $this->skipValidation && ! $this->validate($data)) {
             return false;
         }
 

From a2c7b3f18c251d74a124b55da54cb2f7d0360da2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Nov 2023 09:15:51 +0900
Subject: [PATCH 274/380] chore: update phpstan-baseline

---
 phpstan-baseline.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 039eedaaccdc..d1fd9361ac01 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -51,11 +51,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/BaseModel.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in &&, array\\|null given on the left side\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/BaseModel.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, array\\|null given\\.$#',
 	'count' => 1,

From f4d17d24e499f65bb85ae7218b21f662c17a133c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Nov 2023 09:20:27 +0900
Subject: [PATCH 275/380] refactor: extract setCreatedField() and
 setUpdatedField()

---
 system/BaseModel.php | 62 ++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 38f63c5f189a..bd4d0ab59b18 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -783,14 +783,8 @@ public function insert($data = null, bool $returnID = true)
 
         // Set created_at and updated_at with same time
         $date = $this->setDate();
-
-        if ($this->useTimestamps && $this->createdField !== '' && ! array_key_exists($this->createdField, $data)) {
-            $data[$this->createdField] = $date;
-        }
-
-        if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $data)) {
-            $data[$this->updatedField] = $date;
-        }
+        $data = $this->setCreatedField($data, $date);
+        $data = $this->setUpdatedField($data, $date);
 
         $eventData = ['data' => $data];
 
@@ -822,6 +816,36 @@ public function insert($data = null, bool $returnID = true)
         return $returnID ? $this->insertID : $result;
     }
 
+    /**
+     * Set datetime to created field.
+     *
+     * @phpstan-param row_array $row
+     * @param int|string $date timestamp or datetime string
+     */
+    protected function setCreatedField(array $row, $date): array
+    {
+        if ($this->useTimestamps && $this->createdField !== '' && ! array_key_exists($this->createdField, $row)) {
+            $row[$this->createdField] = $date;
+        }
+
+        return $row;
+    }
+
+    /**
+     * Set datetime to updated field.
+     *
+     * @phpstan-param row_array $row
+     * @param int|string $date timestamp or datetime string
+     */
+    protected function setUpdatedField(array $row, $date): array
+    {
+        if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $row)) {
+            $row[$this->updatedField] = $date;
+        }
+
+        return $row;
+    }
+
     /**
      * Compiles batch insert runs the queries, validating each row prior.
      *
@@ -871,14 +895,8 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
 
                 // Set created_at and updated_at with same time
                 $date = $this->setDate();
-
-                if ($this->useTimestamps && $this->createdField !== '' && ! array_key_exists($this->createdField, $row)) {
-                    $row[$this->createdField] = $date;
-                }
-
-                if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $row)) {
-                    $row[$this->updatedField] = $date;
-                }
+                $row  = $this->setCreatedField($row, $date);
+                $row  = $this->setUpdatedField($row, $date);
             }
         }
 
@@ -945,9 +963,7 @@ public function update($id = null, $data = null): bool
             throw DataException::forEmptyDataset('update');
         }
 
-        if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $data)) {
-            $data[$this->updatedField] = $this->setDate();
-        }
+        $data = $this->setUpdatedField($data, $this->setDate());
 
         $eventData = [
             'id'   => $id,
@@ -1031,9 +1047,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
                     $row[$index] = $updateIndex;
                 }
 
-                if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, $row)) {
-                    $row[$this->updatedField] = $this->setDate();
-                }
+                $row = $this->setUpdatedField($row, $this->setDate());
             }
         }
 
@@ -1165,9 +1179,7 @@ public function replace(?array $data = null, bool $returnSQL = false)
             return false;
         }
 
-        if ($this->useTimestamps && $this->updatedField !== '' && ! array_key_exists($this->updatedField, (array) $data)) {
-            $data[$this->updatedField] = $this->setDate();
-        }
+        $data = $this->setUpdatedField((array) $data, $this->setDate());
 
         return $this->doReplace($data, $returnSQL);
     }

From b2bf84d720f1bef3de8e9a2cfe2a4b9fc5175425 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Nov 2023 09:29:58 +0900
Subject: [PATCH 276/380] refactor: replace $data with $row

---
 system/BaseModel.php | 76 ++++++++++++++++++++++----------------------
 system/Model.php     | 40 +++++++++++------------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index bd4d0ab59b18..a0faaddefe0b 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -478,13 +478,13 @@ abstract protected function doOnlyDeleted();
      * Compiles a replace and runs the query.
      * This method works only with dbCalls.
      *
-     * @param array|null $data Data
-     * @phpstan-param row_array|null $data
+     * @param array|null $row Row data
+     * @phpstan-param row_array|null $row
      * @param bool $returnSQL Set to true to return Query String
      *
      * @return BaseResult|false|Query|string
      */
-    abstract protected function doReplace(?array $data = null, bool $returnSQL = false);
+    abstract protected function doReplace(?array $row = null, bool $returnSQL = false);
 
     /**
      * Grabs the last error(s) that occurred from the Database connection.
@@ -741,8 +741,8 @@ public function getInsertID()
      * Inserts data into the database. If an object is provided,
      * it will attempt to convert it to an array.
      *
-     * @param array|object|null $data Data
-     * @phpstan-param row_array|object|null $data
+     * @param array|object|null $row Row data
+     * @phpstan-param row_array|object|null $row
      * @param bool $returnID Whether insert ID should be returned or not.
      *
      * @return bool|int|string insert ID or true on success. false on failure.
@@ -750,7 +750,7 @@ public function getInsertID()
      *
      * @throws ReflectionException
      */
-    public function insert($data = null, bool $returnID = true)
+    public function insert($row = null, bool $returnID = true)
     {
         $this->insertID = 0;
 
@@ -758,10 +758,10 @@ public function insert($data = null, bool $returnID = true)
         $cleanValidationRules       = $this->cleanValidationRules;
         $this->cleanValidationRules = false;
 
-        $data = $this->transformDataToArray($data, 'insert');
+        $row = $this->transformDataToArray($row, 'insert');
 
         // Validate data before saving.
-        if (! $this->skipValidation && ! $this->validate($data)) {
+        if (! $this->skipValidation && ! $this->validate($row)) {
             // Restore $cleanValidationRules
             $this->cleanValidationRules = $cleanValidationRules;
 
@@ -773,20 +773,20 @@ public function insert($data = null, bool $returnID = true)
 
         // Must be called first, so we don't
         // strip out created_at values.
-        $data = $this->doProtectFieldsForInsert($data);
+        $row = $this->doProtectFieldsForInsert($row);
 
         // doProtectFields() can further remove elements from
         // $data so we need to check for empty dataset again
-        if (! $this->allowEmptyInserts && empty($data)) {
+        if (! $this->allowEmptyInserts && empty($row)) {
             throw DataException::forEmptyDataset('insert');
         }
 
         // Set created_at and updated_at with same time
         $date = $this->setDate();
-        $data = $this->setCreatedField($data, $date);
-        $data = $this->setUpdatedField($data, $date);
+        $row  = $this->setCreatedField($row, $date);
+        $row  = $this->setUpdatedField($row, $date);
 
-        $eventData = ['data' => $data];
+        $eventData = ['data' => $row];
 
         if ($this->tempAllowCallbacks) {
             $eventData = $this->trigger('beforeInsert', $eventData);
@@ -931,12 +931,12 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
      * it will attempt to convert it into an array.
      *
      * @param array|int|string|null $id
-     * @param array|object|null     $data
-     * @phpstan-param row_array|object|null $data
+     * @param array|object|null     $row Row data
+     * @phpstan-param row_array|object|null $row
      *
      * @throws ReflectionException
      */
-    public function update($id = null, $data = null): bool
+    public function update($id = null, $row = null): bool
     {
         if (is_bool($id)) {
             throw new InvalidArgumentException('update(): argument #1 ($id) should not be boolean.');
@@ -946,28 +946,28 @@ public function update($id = null, $data = null): bool
             $id = [$id];
         }
 
-        $data = $this->transformDataToArray($data, 'update');
+        $row = $this->transformDataToArray($row, 'update');
 
         // Validate data before saving.
-        if (! $this->skipValidation && ! $this->validate($data)) {
+        if (! $this->skipValidation && ! $this->validate($row)) {
             return false;
         }
 
         // Must be called first, so we don't
         // strip out updated_at values.
-        $data = $this->doProtectFields($data);
+        $row = $this->doProtectFields($row);
 
         // doProtectFields() can further remove elements from
         // $data, so we need to check for empty dataset again
-        if (empty($data)) {
+        if (empty($row)) {
             throw DataException::forEmptyDataset('update');
         }
 
-        $data = $this->setUpdatedField($data, $this->setDate());
+        $row = $this->setUpdatedField($row, $this->setDate());
 
         $eventData = [
             'id'   => $id,
-            'data' => $data,
+            'data' => $row,
         ];
 
         if ($this->tempAllowCallbacks) {
@@ -1166,22 +1166,22 @@ public function onlyDeleted()
     /**
      * Compiles a replace and runs the query.
      *
-     * @param array|null $data Data
-     * @phpstan-param row_array|null $data
+     * @param array|null $row Row data
+     * @phpstan-param row_array|null $row
      * @param bool $returnSQL Set to true to return Query String
      *
      * @return BaseResult|false|Query|string
      */
-    public function replace(?array $data = null, bool $returnSQL = false)
+    public function replace(?array $row = null, bool $returnSQL = false)
     {
         // Validate data before saving.
-        if (($data !== null) && ! $this->skipValidation && ! $this->validate($data)) {
+        if (($row !== null) && ! $this->skipValidation && ! $this->validate($row)) {
             return false;
         }
 
-        $data = $this->setUpdatedField((array) $data, $this->setDate());
+        $row = $this->setUpdatedField((array) $row, $this->setDate());
 
-        return $this->doReplace($data, $returnSQL);
+        return $this->doReplace($row, $returnSQL);
     }
 
     /**
@@ -1749,48 +1749,48 @@ protected function objectToRawArray($object, bool $onlyChanged = true, bool $rec
     /**
      * Transform data to array.
      *
-     * @param array|object|null $data Data
-     * @phpstan-param row_array|object|null $data
+     * @param array|object|null $row Row data
+     * @phpstan-param row_array|object|null $row
      * @param string $type Type of data (insert|update)
      *
      * @throws DataException
      * @throws InvalidArgumentException
      * @throws ReflectionException
      */
-    protected function transformDataToArray($data, string $type): array
+    protected function transformDataToArray($row, string $type): array
     {
         if (! in_array($type, ['insert', 'update'], true)) {
             throw new InvalidArgumentException(sprintf('Invalid type "%s" used upon transforming data to array.', $type));
         }
 
-        if (! $this->allowEmptyInserts && empty($data)) {
+        if (! $this->allowEmptyInserts && empty($row)) {
             throw DataException::forEmptyDataset($type);
         }
 
         // If $data is using a custom class with public or protected
         // properties representing the collection elements, we need to grab
         // them as an array.
-        if (is_object($data) && ! $data instanceof stdClass) {
+        if (is_object($row) && ! $row instanceof stdClass) {
             // If it validates with entire rules, all fields are needed.
             $onlyChanged = ($this->skipValidation === false && $this->cleanValidationRules === false)
                 ? false : ($type === 'update');
 
-            $data = $this->objectToArray($data, $onlyChanged, true);
+            $row = $this->objectToArray($row, $onlyChanged, true);
         }
 
         // If it's still a stdClass, go ahead and convert to
         // an array so doProtectFields and other model methods
         // don't have to do special checks.
-        if (is_object($data)) {
-            $data = (array) $data;
+        if (is_object($row)) {
+            $row = (array) $row;
         }
 
         // If it's still empty here, means $data is no change or is empty object
-        if (! $this->allowEmptyInserts && empty($data)) {
+        if (! $this->allowEmptyInserts && empty($row)) {
             throw DataException::forEmptyDataset($type);
         }
 
-        return $data;
+        return $row;
     }
 
     /**
diff --git a/system/Model.php b/system/Model.php
index 8d8645fa9572..91bbc94a6172 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -481,15 +481,15 @@ protected function doOnlyDeleted()
      * Compiles a replace into string and runs the query
      * This method works only with dbCalls.
      *
-     * @param array|null $data Data
-     * @phpstan-param row_array|null $data
+     * @param array|null $row Data
+     * @phpstan-param row_array|null $row
      * @param bool $returnSQL Set to true to return Query String
      *
      * @return BaseResult|false|Query|string
      */
-    protected function doReplace(?array $data = null, bool $returnSQL = false)
+    protected function doReplace(?array $row = null, bool $returnSQL = false)
     {
-        return $this->builder()->testMode($returnSQL)->replace($data);
+        return $this->builder()->testMode($returnSQL)->replace($row);
     }
 
     /**
@@ -713,8 +713,8 @@ protected function shouldUpdate($data): bool
      * Inserts data into the database. If an object is provided,
      * it will attempt to convert it to an array.
      *
-     * @param array|object|null $data
-     * @phpstan-param row_array|object|null $data
+     * @param array|object|null $row
+     * @phpstan-param row_array|object|null $row
      * @param bool $returnID Whether insert ID should be returned or not.
      *
      * @return bool|int|string
@@ -722,21 +722,21 @@ protected function shouldUpdate($data): bool
      *
      * @throws ReflectionException
      */
-    public function insert($data = null, bool $returnID = true)
+    public function insert($row = null, bool $returnID = true)
     {
         if (! empty($this->tempData['data'])) {
-            if (empty($data)) {
-                $data = $this->tempData['data'];
+            if (empty($row)) {
+                $row = $this->tempData['data'];
             } else {
-                $data = $this->transformDataToArray($data, 'insert');
-                $data = array_merge($this->tempData['data'], $data);
+                $row = $this->transformDataToArray($row, 'insert');
+                $row = array_merge($this->tempData['data'], $row);
             }
         }
 
         $this->escape   = $this->tempData['escape'] ?? [];
         $this->tempData = [];
 
-        return parent::insert($data, $returnID);
+        return parent::insert($row, $returnID);
     }
 
     /**
@@ -779,26 +779,26 @@ protected function doProtectFieldsForInsert(array $data): array
      * it will attempt to convert it into an array.
      *
      * @param array|int|string|null $id
-     * @param array|object|null     $data
-     * @phpstan-param row_array|object|null $data
+     * @param array|object|null     $row
+     * @phpstan-param row_array|object|null $row
      *
      * @throws ReflectionException
      */
-    public function update($id = null, $data = null): bool
+    public function update($id = null, $row = null): bool
     {
         if (! empty($this->tempData['data'])) {
-            if (empty($data)) {
-                $data = $this->tempData['data'];
+            if (empty($row)) {
+                $row = $this->tempData['data'];
             } else {
-                $data = $this->transformDataToArray($data, 'update');
-                $data = array_merge($this->tempData['data'], $data);
+                $row = $this->transformDataToArray($row, 'update');
+                $row = array_merge($this->tempData['data'], $row);
             }
         }
 
         $this->escape   = $this->tempData['escape'] ?? [];
         $this->tempData = [];
 
-        return parent::update($id, $data);
+        return parent::update($id, $row);
     }
 
     /**

From 7ad3c38ee9f46936d8673148bfb4ce88477ee569 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Nov 2023 13:25:21 +0900
Subject: [PATCH 277/380] refactor: replace $data with $row

---
 system/BaseModel.php | 107 +++++++++++++++++++++++--------------------
 system/Model.php     |  68 ++++++++++++++-------------
 2 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index a0faaddefe0b..0d3df3d465a1 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -400,11 +400,12 @@ abstract protected function doFirst();
      * Inserts data into the current database.
      * This method works only with dbCalls.
      *
-     * @param array $data Data
+     * @param array $row Row data
+     * @phpstan-param row_array $row
      *
      * @return bool
      */
-    abstract protected function doInsert(array $data);
+    abstract protected function doInsert(array $row);
 
     /**
      * Compiles batch insert and runs the queries, validating each row prior.
@@ -423,10 +424,11 @@ abstract protected function doInsertBatch(?array $set = null, ?bool $escape = nu
      * Updates a single record in the database.
      * This method works only with dbCalls.
      *
-     * @param array|int|string|null $id   ID
-     * @param array|null            $data Data
+     * @param array|int|string|null $id  ID
+     * @param array|null            $row Row data
+     * @phpstan-param row_array|null $row
      */
-    abstract protected function doUpdate($id = null, $data = null): bool;
+    abstract protected function doUpdate($id = null, $row = null): bool;
 
     /**
      * Compiles an update and runs the query.
@@ -509,15 +511,16 @@ abstract protected function idValue($data);
      * Public getter to return the id value using the idValue() method.
      * For example with SQL this will return $data->$this->primaryKey.
      *
-     * @param array|object $data
+     * @param array|object $row Row data
+     * @phpstan-param row_array|object $row
      *
      * @return array|int|string|null
      *
      * @todo: Make abstract in version 5.0
      */
-    public function getIdValue($data)
+    public function getIdValue($row)
     {
-        return $this->idValue($data);
+        return $this->idValue($row);
     }
 
     /**
@@ -693,20 +696,21 @@ public function first()
      * you must ensure that the class will provide access to the class
      * variables, even if through a magic method.
      *
-     * @param array|object $data Data
+     * @param array|object $row Row data
+     * @phpstan-param row_array|object $row
      *
      * @throws ReflectionException
      */
-    public function save($data): bool
+    public function save($row): bool
     {
-        if (empty($data)) {
+        if (empty($row)) {
             return true;
         }
 
-        if ($this->shouldUpdate($data)) {
-            $response = $this->update($this->getIdValue($data), $data);
+        if ($this->shouldUpdate($row)) {
+            $response = $this->update($this->getIdValue($row), $row);
         } else {
-            $response = $this->insert($data, false);
+            $response = $this->insert($row, false);
 
             if ($response !== false) {
                 $response = true;
@@ -720,11 +724,12 @@ public function save($data): bool
      * This method is called on save to determine if entry have to be updated.
      * If this method returns false insert operation will be executed
      *
-     * @param array|object $data Data
+     * @param array|object $row Row data
+     * @phpstan-param row_array|object $row
      */
-    protected function shouldUpdate($data): bool
+    protected function shouldUpdate($row): bool
     {
-        return ! empty($this->getIdValue($data));
+        return ! empty($this->getIdValue($row));
     }
 
     /**
@@ -776,7 +781,7 @@ public function insert($row = null, bool $returnID = true)
         $row = $this->doProtectFieldsForInsert($row);
 
         // doProtectFields() can further remove elements from
-        // $data so we need to check for empty dataset again
+        // $row, so we need to check for empty dataset again
         if (! $this->allowEmptyInserts && empty($row)) {
             throw DataException::forEmptyDataset('insert');
         }
@@ -867,7 +872,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
 
         if (is_array($set)) {
             foreach ($set as &$row) {
-                // If $data is using a custom class with public or protected
+                // If $row is using a custom class with public or protected
                 // properties representing the collection elements, we need to grab
                 // them as an array.
                 if (is_object($row) && ! $row instanceof stdClass) {
@@ -958,7 +963,7 @@ public function update($id = null, $row = null): bool
         $row = $this->doProtectFields($row);
 
         // doProtectFields() can further remove elements from
-        // $data, so we need to check for empty dataset again
+        // $row, so we need to check for empty dataset again
         if (empty($row)) {
             throw DataException::forEmptyDataset('update');
         }
@@ -1007,7 +1012,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
     {
         if (is_array($set)) {
             foreach ($set as &$row) {
-                // If $data is using a custom class with public or protected
+                // If $row is using a custom class with public or protected
                 // properties representing the collection elements, we need to grab
                 // them as an array.
                 if (is_object($row) && ! $row instanceof stdClass) {
@@ -1269,46 +1274,48 @@ public function protect(bool $protect = true)
      * Ensures that only the fields that are allowed to be updated are
      * in the data array.
      *
-     * Used by update() and updateBatch() to protect against mass assignment
-     * vulnerabilities.
+     * @used-by update() to protect against mass assignment vulnerabilities.
+     * @used-by updateBatch() to protect against mass assignment vulnerabilities.
      *
-     * @param array $data Data
+     * @param array $row Row data
+     * @phpstan-param row_array $row
      *
      * @throws DataException
      */
-    protected function doProtectFields(array $data): array
+    protected function doProtectFields(array $row): array
     {
         if (! $this->protectFields) {
-            return $data;
+            return $row;
         }
 
         if (empty($this->allowedFields)) {
             throw DataException::forInvalidAllowedFields(static::class);
         }
 
-        foreach (array_keys($data) as $key) {
+        foreach (array_keys($row) as $key) {
             if (! in_array($key, $this->allowedFields, true)) {
-                unset($data[$key]);
+                unset($row[$key]);
             }
         }
 
-        return $data;
+        return $row;
     }
 
     /**
      * Ensures that only the fields that are allowed to be inserted are in
      * the data array.
      *
-     * Used by insert() and insertBatch() to protect against mass assignment
-     * vulnerabilities.
+     * @used-by insert() to protect against mass assignment vulnerabilities.
+     * @used-by insertBatch() to protect against mass assignment vulnerabilities.
      *
-     * @param array $data Data
+     * @param array $row Row data
+     * @phpstan-param row_array $row
      *
      * @throws DataException
      */
-    protected function doProtectFieldsForInsert(array $data): array
+    protected function doProtectFieldsForInsert(array $row): array
     {
-        return $this->doProtectFields($data);
+        return $this->doProtectFields($row);
     }
 
     /**
@@ -1493,25 +1500,26 @@ public function cleanRules(bool $choice = false)
     }
 
     /**
-     * Validate the data against the validation rules (or the validation group)
+     * Validate the row data against the validation rules (or the validation group)
      * specified in the class property, $validationRules.
      *
-     * @param array|object $data Data
+     * @param array|object $row Row data
+     * @phpstan-param row_array|object $row
      */
-    public function validate($data): bool
+    public function validate($row): bool
     {
         $rules = $this->getValidationRules();
 
-        if ($this->skipValidation || empty($rules) || empty($data)) {
+        if ($this->skipValidation || empty($rules) || empty($row)) {
             return true;
         }
 
         // Validation requires array, so cast away.
-        if (is_object($data)) {
-            $data = (array) $data;
+        if (is_object($row)) {
+            $row = (array) $row;
         }
 
-        $rules = $this->cleanValidationRules ? $this->cleanValidationRules($rules, $data) : $rules;
+        $rules = $this->cleanValidationRules ? $this->cleanValidationRules($rules, $row) : $rules;
 
         // If no data existed that needs validation
         // our job is done here.
@@ -1521,7 +1529,7 @@ public function validate($data): bool
 
         $this->validation->reset()->setRules($rules, $this->validationMessages);
 
-        return $this->validation->run($data, null, $this->DBGroup);
+        return $this->validation->run($row, null, $this->DBGroup);
     }
 
     /**
@@ -1565,17 +1573,18 @@ public function getValidationMessages(): array
      * currently so that rules don't block updating when only updating
      * a partial row.
      *
-     * @param array      $rules Array containing field name and rule
-     * @param array|null $data  Data
+     * @param array $rules Array containing field name and rule
+     * @param array $row   Row data (@TODO Remove null in param type)
+     * @phpstan-param row_array $row
      */
-    protected function cleanValidationRules(array $rules, ?array $data = null): array
+    protected function cleanValidationRules(array $rules, ?array $row = null): array
     {
-        if (empty($data)) {
+        if (empty($row)) {
             return [];
         }
 
         foreach (array_keys($rules) as $field) {
-            if (! array_key_exists($field, $data)) {
+            if (! array_key_exists($field, $row)) {
                 unset($rules[$field]);
             }
         }
@@ -1767,7 +1776,7 @@ protected function transformDataToArray($row, string $type): array
             throw DataException::forEmptyDataset($type);
         }
 
-        // If $data is using a custom class with public or protected
+        // If $row is using a custom class with public or protected
         // properties representing the collection elements, we need to grab
         // them as an array.
         if (is_object($row) && ! $row instanceof stdClass) {
@@ -1785,7 +1794,7 @@ protected function transformDataToArray($row, string $type): array
             $row = (array) $row;
         }
 
-        // If it's still empty here, means $data is no change or is empty object
+        // If it's still empty here, means $row is no change or is empty object
         if (! $this->allowEmptyInserts && empty($row)) {
             throw DataException::forEmptyDataset($type);
         }
diff --git a/system/Model.php b/system/Model.php
index 91bbc94a6172..4c55aac937bf 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -274,29 +274,30 @@ protected function doFirst()
      * Inserts data into the current table.
      * This method works only with dbCalls.
      *
-     * @param array $data Data
+     * @param array $row Row data
+     * @phpstan-param row_array $row
      *
      * @return bool
      */
-    protected function doInsert(array $data)
+    protected function doInsert(array $row)
     {
         $escape       = $this->escape;
         $this->escape = [];
 
         // Require non-empty primaryKey when
         // not using auto-increment feature
-        if (! $this->useAutoIncrement && empty($data[$this->primaryKey])) {
+        if (! $this->useAutoIncrement && empty($row[$this->primaryKey])) {
             throw DataException::forEmptyPrimaryKey('insert');
         }
 
         $builder = $this->builder();
 
         // Must use the set() method to ensure to set the correct escape flag
-        foreach ($data as $key => $val) {
+        foreach ($row as $key => $val) {
             $builder->set($key, $val, $escape[$key] ?? null);
         }
 
-        if ($this->allowEmptyInserts && empty($data)) {
+        if ($this->allowEmptyInserts && empty($row)) {
             $table = $this->db->protectIdentifiers($this->table, true, null, false);
             if ($this->db->getPlatform() === 'MySQLi') {
                 $sql = 'INSERT INTO ' . $table . ' VALUES ()';
@@ -327,7 +328,7 @@ protected function doInsert(array $data)
 
         // If insertion succeeded then save the insert ID
         if ($result) {
-            $this->insertID = ! $this->useAutoIncrement ? $data[$this->primaryKey] : $this->db->insertID();
+            $this->insertID = ! $this->useAutoIncrement ? $row[$this->primaryKey] : $this->db->insertID();
         }
 
         return $result;
@@ -364,9 +365,10 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
      * This method works only with dbCalls.
      *
      * @param array|int|string|null $id
-     * @param array|null            $data
+     * @param array|null            $row Row data
+     * @phpstan-param row_array|null $row
      */
-    protected function doUpdate($id = null, $data = null): bool
+    protected function doUpdate($id = null, $row = null): bool
     {
         $escape       = $this->escape;
         $this->escape = [];
@@ -378,7 +380,7 @@ protected function doUpdate($id = null, $data = null): bool
         }
 
         // Must use the set() method to ensure to set the correct escape flag
-        foreach ($data as $key => $val) {
+        foreach ($row as $key => $val) {
             $builder->set($key, $val, $escape[$key] ?? null);
         }
 
@@ -529,33 +531,34 @@ protected function idValue($data)
     /**
      * Returns the id value for the data array or object
      *
-     * @param array|object $data Data
+     * @param array|object $row Row data
+     * @phpstan-param row_array|object $row
      *
      * @return array|int|string|null
      */
-    public function getIdValue($data)
+    public function getIdValue($row)
     {
-        if (is_object($data) && isset($data->{$this->primaryKey})) {
+        if (is_object($row) && isset($row->{$this->primaryKey})) {
             // Get the raw primary key value of the Entity.
-            if ($data instanceof Entity) {
-                $cast = $data->cast();
+            if ($row instanceof Entity) {
+                $cast = $row->cast();
 
                 // Disable Entity casting, because raw primary key value is needed for database.
-                $data->cast(false);
+                $row->cast(false);
 
-                $primaryKey = $data->{$this->primaryKey};
+                $primaryKey = $row->{$this->primaryKey};
 
                 // Restore Entity casting setting.
-                $data->cast($cast);
+                $row->cast($cast);
 
                 return $primaryKey;
             }
 
-            return $data->{$this->primaryKey};
+            return $row->{$this->primaryKey};
         }
 
-        if (is_array($data) && ! empty($data[$this->primaryKey])) {
-            return $data[$this->primaryKey];
+        if (is_array($row) && ! empty($row[$this->primaryKey])) {
+            return $row[$this->primaryKey];
         }
 
         return null;
@@ -692,11 +695,11 @@ public function set($key, $value = '', ?bool $escape = null)
      * This method is called on save to determine if entry have to be updated
      * If this method return false insert operation will be executed
      *
-     * @param array|object $data Data
+     * @param array|object $row Data
      */
-    protected function shouldUpdate($data): bool
+    protected function shouldUpdate($row): bool
     {
-        if (parent::shouldUpdate($data) === false) {
+        if (parent::shouldUpdate($row) === false) {
             return false;
         }
 
@@ -706,7 +709,7 @@ protected function shouldUpdate($data): bool
 
         // When useAutoIncrement feature is disabled, check
         // in the database if given record already exists
-        return $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
+        return $this->where($this->primaryKey, $this->getIdValue($row))->countAllResults() === 1;
     }
 
     /**
@@ -743,35 +746,36 @@ public function insert($row = null, bool $returnID = true)
      * Ensures that only the fields that are allowed to be inserted are in
      * the data array.
      *
-     * Used by insert() and insertBatch() to protect against mass assignment
-     * vulnerabilities.
+     * @used-by insert() to protect against mass assignment vulnerabilities.
+     * @used-by insertBatch() to protect against mass assignment vulnerabilities.
      *
-     * @param array $data Data
+     * @param array $row Row data
+     * @phpstan-param row_array $row
      *
      * @throws DataException
      */
-    protected function doProtectFieldsForInsert(array $data): array
+    protected function doProtectFieldsForInsert(array $row): array
     {
         if (! $this->protectFields) {
-            return $data;
+            return $row;
         }
 
         if (empty($this->allowedFields)) {
             throw DataException::forInvalidAllowedFields(static::class);
         }
 
-        foreach (array_keys($data) as $key) {
+        foreach (array_keys($row) as $key) {
             // Do not remove the non-auto-incrementing primary key data.
             if ($this->useAutoIncrement === false && $key === $this->primaryKey) {
                 continue;
             }
 
             if (! in_array($key, $this->allowedFields, true)) {
-                unset($data[$key]);
+                unset($row[$key]);
             }
         }
 
-        return $data;
+        return $row;
     }
 
     /**

From f644cdcb8019800479ae52022b74dbd4a615c93a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Dec 2023 11:34:16 +0900
Subject: [PATCH 278/380] docs: update sample code and add about
 $autoRoutesImproved just in case

---
 user_guide_src/source/incoming/routing.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 646b66bd4ffc..659e6b03c168 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -824,9 +824,13 @@ Enable Auto Routing (Legacy)
 
 Since v4.2.0, the auto-routing is disabled by default.
 
-To use it, you need to change the setting ``$autoRoute`` option to true in **app/Config/Routing.php**::
+To use it, you need to change the setting ``$autoRoute`` option to ``true`` in **app/Config/Routing.php**::
+
+    public bool $autoRoute = true;
+
+And set the property ``$autoRoutesImproved`` to ``false`` in **app/Config/Feature.php**::
 
-    $routes->setAutoRoute(true);
+    public bool $autoRoutesImproved = false;
 
 URI Segments (Legacy)
 =====================

From fa9002a2a3035e1cf62189049719fb22db63c95a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Dec 2023 11:35:39 +0900
Subject: [PATCH 279/380] docs: decorate `true`

---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 659e6b03c168..c1820fe5a3cd 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -693,7 +693,7 @@ and execute the corresponding controller methods.
 Enable Auto Routing
 ===================
 
-To use it, you need to change the setting ``$autoRoute`` option to true in **app/Config/Routing.php**::
+To use it, you need to change the setting ``$autoRoute`` option to ``true`` in **app/Config/Routing.php**::
 
     public bool $autoRoute = true;
 

From 45b9d1db7219658e0fd922b62c66706c2f383481 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:20:19 +0400
Subject: [PATCH 280/380] Update BaseBuilder.php

The function returns false on failure, but on success it returns the BaseResult unless the pretend flag is set in the query() function. In that case it returns a Query object. Not having this in the PHPdoc is giving PHPStorm fits.
---
 system/Database/BaseBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index badf2d35cdfc..190904020e21 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2270,7 +2270,7 @@ public function getCompiledInsert(bool $reset = true)
      *
      * @param array|object|null $set
      *
-     * @return bool
+     * @return bool|BaseResult|Query
      *
      * @throws DatabaseException
      */

From f0f2bc41aab4bf553abd0d051f322e5acfb4d37c Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:41:54 +0400
Subject: [PATCH 281/380] Update BaseBuilder.php

Fixed coding style
---
 system/Database/BaseBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 190904020e21..6e3829fa079b 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2270,7 +2270,7 @@ public function getCompiledInsert(bool $reset = true)
      *
      * @param array|object|null $set
      *
-     * @return bool|BaseResult|Query
+     * @return BaseResult|bool|Query
      *
      * @throws DatabaseException
      */

From 6fd003c6c21c671ccf35b73301d0fce4702e701b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Dec 2023 20:27:57 +0900
Subject: [PATCH 282/380] test: move GetCompiledModelTest that was in wrong
 place

---
 tests/{_support => system}/Models/GetCompiledModelTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename tests/{_support => system}/Models/GetCompiledModelTest.php (87%)

diff --git a/tests/_support/Models/GetCompiledModelTest.php b/tests/system/Models/GetCompiledModelTest.php
similarity index 87%
rename from tests/_support/Models/GetCompiledModelTest.php
rename to tests/system/Models/GetCompiledModelTest.php
index ce034d56363c..90b526d04a33 100644
--- a/tests/_support/Models/GetCompiledModelTest.php
+++ b/tests/system/Models/GetCompiledModelTest.php
@@ -44,7 +44,7 @@ private function createModel(string $modelName): Model
     public function testGetCompiledInsert(): void
     {
         $this->expectException(ModelException::class);
-        $this->expectExceptionMessage('You cannot use `getCompiledInsert()` in `Tests\Support\Models\UserObjModel`.');
+        $this->expectExceptionMessage('You cannot use "getCompiledInsert()" in "Tests\Support\Models\UserObjModel".');
 
         $this->createModel(UserObjModel::class);
 
@@ -60,7 +60,7 @@ public function testGetCompiledInsert(): void
     public function testGetCompiledUpdate(): void
     {
         $this->expectException(ModelException::class);
-        $this->expectExceptionMessage('You cannot use `getCompiledUpdate()` in `Tests\Support\Models\UserObjModel`.');
+        $this->expectExceptionMessage('You cannot use "getCompiledUpdate()" in "Tests\Support\Models\UserObjModel".');
 
         $this->createModel(UserObjModel::class);
 

From 43de6c070eeb0d137f3da6519b10a774d9e9db5b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Dec 2023 20:35:38 +0900
Subject: [PATCH 283/380] test: add @group

---
 tests/system/Models/GetCompiledModelTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/system/Models/GetCompiledModelTest.php b/tests/system/Models/GetCompiledModelTest.php
index 90b526d04a33..dfe4a19d4054 100644
--- a/tests/system/Models/GetCompiledModelTest.php
+++ b/tests/system/Models/GetCompiledModelTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class GetCompiledModelTest extends CIUnitTestCase
 {

From be10f21a48cb24a7589f5764c19c6e0647a03090 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Dec 2023 07:23:03 +0900
Subject: [PATCH 284/380] test: refactor by rector

---
 tests/system/Models/GetCompiledModelTest.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/system/Models/GetCompiledModelTest.php b/tests/system/Models/GetCompiledModelTest.php
index dfe4a19d4054..59e3eff080d8 100644
--- a/tests/system/Models/GetCompiledModelTest.php
+++ b/tests/system/Models/GetCompiledModelTest.php
@@ -24,10 +24,7 @@
  */
 final class GetCompiledModelTest extends CIUnitTestCase
 {
-    /**
-     * @var Model
-     */
-    private $model;
+    private ?object $model = null;
 
     /**
      * Create an instance of Model for use in testing.
@@ -50,7 +47,7 @@ public function testGetCompiledInsert(): void
 
         $this->createModel(UserObjModel::class);
 
-        $sql = $this->model
+        $this->model
             ->set('name', 'Mark')
             ->set('email', 'mark@example.com')
             ->getCompiledInsert();
@@ -66,7 +63,7 @@ public function testGetCompiledUpdate(): void
 
         $this->createModel(UserObjModel::class);
 
-        $sql = $this->model
+        $this->model
             ->set('name', 'Mark')
             ->set('email', 'mark@example.com')
             ->getCompiledUpdate();

From 3d96fc53975a101932825f6eb8103662ac2be640 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Dec 2023 13:35:52 +0900
Subject: [PATCH 285/380] docs: add link to section

---
 user_guide_src/source/libraries/email.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 33386bc8b17c..f4cac03d8ee2 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -42,7 +42,7 @@ Setting Email Preferences
 There are 21 different preferences available to tailor how your email
 messages are sent. You can either set them manually as described here,
 or automatically via preferences stored in your config file, described
-below:
+in `Email Preferences`_.
 
 Setting Email Preferences by Passing an Array
 ---------------------------------------------

From ee7e590daaf26bd37ea2c7d98594ac21c4b60f27 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Dec 2023 13:36:17 +0900
Subject: [PATCH 286/380] docs: improve readability

---
 user_guide_src/source/libraries/email.rst | 65 ++++++++++++-----------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index f4cac03d8ee2..88f978b47f5e 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -108,38 +108,39 @@ Email Preferences
 The following is a list of all the preferences that can be set when
 sending email.
 
-=================== ====================== ============================ =======================================================================
-Preference          Default Value          Options                      Description
-=================== ====================== ============================ =======================================================================
-**userAgent**       CodeIgniter            None                         The "user agent".
-**protocol**        mail                   mail, sendmail, or smtp      The mail sending protocol.
-**mailPath**        /usr/sbin/sendmail     None                         The server path to Sendmail.
-**SMTPHost**        No Default             None                         SMTP Server Address.
-**SMTPUser**        No Default             None                         SMTP Username.
-**SMTPPass**        No Default             None                         SMTP Password.
-**SMTPPort**        25                     None                         SMTP Port. (If set to ``465``, TLS will be used for the connection
-                                                                        regardless of ``SMTPCrypto`` setting.)
-**SMTPTimeout**     5                      None                         SMTP Timeout (in seconds).
-**SMTPKeepAlive**   false                  true or false (boolean)      Enable persistent SMTP connections.
-**SMTPCrypto**      tls                    tls, ssl, or empty string    SMTP Encryption. Setting this to ``ssl`` will create a secure
-                                                                        channel to the server using SSL, and ``tls`` will issue a
-                                                                        ``STARTTLS`` command to the server. Connection on port 465 should
-                                                                        set this to an empty string (``''``). See also
-                                                                        :ref:`email-ssl-tls-for-smtp`.
-**wordWrap**        true                   true or false (boolean)      Enable word-wrap.
-**wrapChars**       76                                                  Character count to wrap at.
-**mailType**        text                   text or html                 Type of mail. If you send HTML email you must send it as a complete web
-                                                                        page. Make sure you don't have any relative links or relative image
-                                                                        paths otherwise they will not work.
-**charset**         utf-8                                               Character set (utf-8, iso-8859-1, etc.).
-**validate**        true                   true or false (boolean)      Whether to validate the email address.
-**priority**        3                      1, 2, 3, 4, 5                Email Priority. 1 = highest. 5 = lowest. 3 = normal.
-**CRLF**            \\n                    "\\r\\n" or "\\n" or "\\r"   Newline character. (Use "\\r\\n" to comply with RFC 822).
-**newline**         \\n                    "\\r\\n" or "\\n" or "\\r"   Newline character. (Use "\\r\\n" to comply with RFC 822).
-**BCCBatchMode**    false                  true or false (boolean)      Enable BCC Batch Mode.
-**BCCBatchSize**    200                    None                         Number of emails in each BCC batch.
-**DSN**             false                  true or false (boolean)      Enable notify message from server
-=================== ====================== ============================ =======================================================================
+=================== =================== ============================ =======================================================================
+Preference          Default Value       Options                      Description
+=================== =================== ============================ =======================================================================
+**userAgent**       CodeIgniter         None                         The "user agent".
+**protocol**        mail                ``mail``, ``sendmail``,      The mail sending protocol.
+                                        or ``smtp``
+**mailPath**        /usr/sbin/sendmail  None                         The server path to Sendmail.
+**SMTPHost**        No Default          None                         SMTP Server Address.
+**SMTPUser**        No Default          None                         SMTP Username.
+**SMTPPass**        No Default          None                         SMTP Password.
+**SMTPPort**        25                  None                         SMTP Port. (If set to ``465``, TLS will be used for the connection
+                                                                     regardless of ``SMTPCrypto`` setting.)
+**SMTPTimeout**     5                   None                         SMTP Timeout (in seconds).
+**SMTPKeepAlive**   false               ``true``/``false`` (boolean) Enable persistent SMTP connections.
+**SMTPCrypto**      tls                 ``tls``, ``ssl``, or         SMTP Encryption. Setting this to ``ssl`` will create a secure
+                                        empty string (``''``)        channel to the server using SSL, and ``tls`` will issue a
+                                                                     ``STARTTLS`` command to the server. Connection on port 465 should
+                                                                     set this to an empty string (``''``). See also
+                                                                     :ref:`email-ssl-tls-for-smtp`.
+**wordWrap**        true                ``true``/``false`` (boolean) Enable word-wrap.
+**wrapChars**       76                                               Character count to wrap at.
+**mailType**        text                ``text`` or ``html``         Type of mail. If you send HTML email you must send it as a complete web
+                                                                     page. Make sure you don't have any relative links or relative image
+                                                                     paths otherwise they will not work.
+**charset**         utf-8                                            Character set (``utf-8``, ``iso-8859-1``, etc.).
+**validate**        true                ``true``/``false`` (boolean) Whether to validate the email address.
+**priority**        3                   1, 2, 3, 4, 5                Email Priority. ``1`` = highest. ``5`` = lowest. ``3`` = normal.
+**CRLF**            \\n                 ``\r\n`` or ``\n`` or ``\r`` Newline character. (Use ``\r\n`` to comply with RFC 822).
+**newline**         \\n                 ``\r\n`` or ``\n`` or ``\r`` Newline character. (Use ``\r\n`` to comply with RFC 822).
+**BCCBatchMode**    false               ``true``/``false`` (boolean) Enable BCC Batch Mode.
+**BCCBatchSize**    200                 None                         Number of emails in each BCC batch.
+**DSN**             false               ``true``/``false`` (boolean) Enable notify message from server
+=================== =================== ============================ =======================================================================
 
 Overriding Word Wrapping
 ========================

From e7cee3c17a1102e60ae1612f3c28317408bd487a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Dec 2023 13:38:37 +0900
Subject: [PATCH 287/380] docs: add missing period

---
 user_guide_src/source/libraries/email.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 88f978b47f5e..e02864e9d2d3 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -139,7 +139,7 @@ Preference          Default Value       Options                      Description
 **newline**         \\n                 ``\r\n`` or ``\n`` or ``\r`` Newline character. (Use ``\r\n`` to comply with RFC 822).
 **BCCBatchMode**    false               ``true``/``false`` (boolean) Enable BCC Batch Mode.
 **BCCBatchSize**    200                 None                         Number of emails in each BCC batch.
-**DSN**             false               ``true``/``false`` (boolean) Enable notify message from server
+**DSN**             false               ``true``/``false`` (boolean) Enable notify message from server.
 =================== =================== ============================ =======================================================================
 
 Overriding Word Wrapping

From 10923dfc622c002f90d039701f2138c6270df925 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Dec 2023 18:42:39 +0900
Subject: [PATCH 288/380] docs: add text decoration

Co-authored-by: Pooya Parsa <pooya_parsa_dadashi@yahoo.com>
---
 user_guide_src/source/libraries/email.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index e02864e9d2d3..82439f0cacf6 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -124,7 +124,7 @@ Preference          Default Value       Options                      Description
 **SMTPKeepAlive**   false               ``true``/``false`` (boolean) Enable persistent SMTP connections.
 **SMTPCrypto**      tls                 ``tls``, ``ssl``, or         SMTP Encryption. Setting this to ``ssl`` will create a secure
                                         empty string (``''``)        channel to the server using SSL, and ``tls`` will issue a
-                                                                     ``STARTTLS`` command to the server. Connection on port 465 should
+                                                                     ``STARTTLS`` command to the server. Connection on port ``465`` should
                                                                      set this to an empty string (``''``). See also
                                                                      :ref:`email-ssl-tls-for-smtp`.
 **wordWrap**        true                ``true``/``false`` (boolean) Enable word-wrap.

From 1dbc95d017d6934b701bb5e892e14171b3fc9d8e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 09:37:08 +0900
Subject: [PATCH 289/380] chore: update phpstan-baseline.php

---
 phpstan-baseline.php | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index d1fd9361ac01..8d647f40e497 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -1261,11 +1261,6 @@
 	'count' => 3,
 	'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\MySQLi\\\\PreparedQuery\\) of method CodeIgniter\\\\Database\\\\MySQLi\\\\PreparedQuery\\:\\:_prepare\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BasePreparedQuery\\<TConnection, TStatement, TResult\\>\\)\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<mysqli,mysqli_stmt,mysqli_result\\>\\:\\:_prepare\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(mysqli_result\\|false\\) of method CodeIgniter\\\\Database\\\\MySQLi\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<mysqli,mysqli_stmt,mysqli_result\\>\\:\\:_getResult\\(\\)$#',
 	'count' => 1,
@@ -1381,11 +1376,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/OCI8/PreparedQuery.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\OCI8\\\\PreparedQuery\\) of method CodeIgniter\\\\Database\\\\OCI8\\\\PreparedQuery\\:\\:_prepare\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BasePreparedQuery\\<TConnection, TStatement, TResult\\>\\)\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<resource,resource,resource\\>\\:\\:_prepare\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/OCI8/PreparedQuery.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#',
 	'count' => 1,
@@ -1511,11 +1501,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/Postgre/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\Postgre\\\\PreparedQuery\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\PreparedQuery\\:\\:_prepare\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BasePreparedQuery\\<TConnection, TStatement, TResult\\>\\)\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<PgSql\\\\Connection,PgSql\\\\Result,PgSql\\\\Result\\>\\:\\:_prepare\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Postgre/PreparedQuery.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -1651,11 +1636,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\:\\:_prepare\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BasePreparedQuery\\<TConnection, TStatement, TResult\\>\\)\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<resource,resource,resource\\>\\:\\:_prepare\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -1726,11 +1706,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_prepare\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BasePreparedQuery\\<TConnection, TStatement, TResult\\>\\)\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<SQLite3,SQLite3Stmt,SQLite3Result\\>\\:\\:_prepare\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(SQLite3Result\\|false\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<SQLite3,SQLite3Stmt,SQLite3Result\\>\\:\\:_getResult\\(\\)$#',
 	'count' => 1,
@@ -2021,16 +1996,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/HTTP/DownloadResponse.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\DownloadResponse\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:noCache\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\Response\\)\\) of method CodeIgniter\\\\HTTP\\\\Response\\:\\:noCache\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/HTTP/DownloadResponse.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\DownloadResponse\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:noCache\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\)\\) of method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:noCache\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/HTTP/DownloadResponse.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\DownloadResponse\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:sendBody\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\Response\\)\\) of method CodeIgniter\\\\HTTP\\\\Response\\:\\:sendBody\\(\\)$#',
 	'count' => 1,

From b7c5db8801d936ba2f5133e4a434aa7c88166f20 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 10:00:37 +0900
Subject: [PATCH 290/380] docs: add sub section title

---
 user_guide_src/source/incoming/routing.rst | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index c1820fe5a3cd..81304cf25a8c 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -69,6 +69,8 @@ and the ``productLookupByID()`` method passing in the match as a variable to the
 
 .. literalinclude:: routing/009.php
 
+.. _routing-http-verb-routes:
+
 HTTP verb Routes
 ================
 
@@ -185,11 +187,20 @@ Placeholders Description
 .. note:: ``{locale}`` cannot be used as a placeholder or other part of the route, as it is reserved for use
     in :doc:`localization </outgoing/localization>`.
 
-Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route:
+.. _routing-placeholder-any:
+
+The Behavior of (:any)
+^^^^^^^^^^^^^^^^^^^^^^
+
+Note that a single ``(:any)`` will match multiple segments in the URL if present.
+
+For example the route:
 
 .. literalinclude:: routing/010.php
 
-will match **product/123**, **product/123/456**, **product/123/456/789** and so on. The implementation in the
+will match **product/123**, **product/123/456**, **product/123/456/789** and so on.
+
+The implementation in the
 Controller should take into account the maximum parameters:
 
 .. literalinclude:: routing/011.php

From 7e6fee7edfefd48fac4dee2299b3dff902e9b166 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 10:04:34 +0900
Subject: [PATCH 291/380] docs: improve explanations and add notes

---
 .../source/installation/upgrade_routing.rst        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 0fc9fe5251d3..83bc5c5ee8a5 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -17,18 +17,22 @@ What has been changed
 - In CI4 the Auto Routing is disabled by default.
 - In CI4 the new more secure :ref:`auto-routing-improved` is introduced.
 - In CI4 the routing is no longer configured by setting the routes as array.
+- The Wildcard ``(:any)`` In CI3 will be the Placeholder ``(:segment)`` in CI4. The ``(:any)`` in CI4 matches multiple segements. See :ref:`URI Routing <routing-placeholder-any>`.
 
 Upgrade Guide
 =============
 
 1. If you use the Auto Routing in the same way as CI3, you need to enable :ref:`auto-routing-legacy`.
-2. The placeholder ``(:any)`` in CI3 will be ``(:segment)`` in CI4.
-3. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
+2. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
 
     - ``$route['journals'] = 'blogs';`` to ``$routes->add('journals', 'Blogs::index');``. This would map to the ``index()`` method in the ``Blogs`` controller.
-    - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:segment)', 'Catalog::productLookup');``
+    - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:segment)', 'Catalog::productLookup');``. Don't forget to replace ``(:any)`` with ``(:segment)``.
     - ``$route['login/(.+)'] = 'auth/login/$1';`` to ``$routes->add('login/(.+)', 'Auth::login/$1');``
 
+    .. note:: For backward compatibility, ``$routes->add()`` is used here. But we
+        strongly recommend to use :ref:`routing-http-verb-routes` like
+        ``$routes->get()`` instead of ``$routes->add()`` for security.
+
 Code Example
 ============
 
@@ -43,3 +47,7 @@ CodeIgniter Version 4.x
 Path: **app/Config/Routes.php**:
 
 .. literalinclude:: upgrade_routing/001.php
+
+.. note:: For backward compatibility, ``$routes->add()`` is used here. But we
+    strongly recommend to use :ref:`routing-http-verb-routes` like
+    ``$routes->get()`` instead of ``$routes->add()`` for security.

From a5fbda1a21e291f21476e5d8b8ae7485f5ef6684 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 10:05:07 +0900
Subject: [PATCH 292/380] docs: update sample code

---
 .../source/installation/upgrade_routing/001.php   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_routing/001.php b/user_guide_src/source/installation/upgrade_routing/001.php
index 1378517e258d..b2cb2ee5d2d5 100644
--- a/user_guide_src/source/installation/upgrade_routing/001.php
+++ b/user_guide_src/source/installation/upgrade_routing/001.php
@@ -1,16 +1,11 @@
 <?php
 
-namespace Config;
+use CodeIgniter\Router\RouteCollection;
 
-// ...
-
-/*
- * --------------------------------------------------------------------
- * Route Definitions
- * --------------------------------------------------------------------
+/**
+ * @var RouteCollection $routes
  */
-
-// ...
+$routes->get('/', 'Home::index');
 
 $routes->add('posts/index', 'Posts::index');
 $routes->add('teams/create', 'Teams::create');
@@ -21,5 +16,3 @@
 $routes->add('drivers/create', 'Drivers::create');
 $routes->add('drivers/update', 'Drivers::update');
 $routes->add('posts/(:segment)', 'Posts::view/$1');
-
-// ...

From b17dbf567ae9f1f68f2a81ab068a0926fa992f41 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 11:15:12 +0900
Subject: [PATCH 293/380] fix: COMPOSER_PATH may be false

PHP Fatal error:  Uncaught TypeError: is_file(): Argument #1 ($filename) must be of type string, bool given in /home/runner/work/CodeIgniter4/CodeIgniter4/system/Autoloader/Autoloader.php:126
---
 system/Test/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index fcd3c9498af3..3e2d54fdb564 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -46,7 +46,7 @@
 defined('FCPATH')        || define('FCPATH', realpath(PUBLICPATH) . DIRECTORY_SEPARATOR);
 defined('TESTPATH')      || define('TESTPATH', realpath(HOMEPATH . 'tests/') . DIRECTORY_SEPARATOR);
 defined('SUPPORTPATH')   || define('SUPPORTPATH', realpath(TESTPATH . '_support/') . DIRECTORY_SEPARATOR);
-defined('COMPOSER_PATH') || define('COMPOSER_PATH', realpath(HOMEPATH . 'vendor/autoload.php'));
+defined('COMPOSER_PATH') || define('COMPOSER_PATH', (string) realpath(HOMEPATH . 'vendor/autoload.php'));
 defined('VENDORPATH')    || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR);
 
 // Load Common.php from App then System

From fbdb66990889bb7cc3c711a88d91fbe995143df2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 09:04:30 +0900
Subject: [PATCH 294/380] docs: add change to upgrade_emails

---
 user_guide_src/source/installation/upgrade_emails.rst | 1 +
 user_guide_src/source/libraries/email.rst             | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index 7eb40a050042..828cc83ce5f7 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -14,6 +14,7 @@ Documentations
 What has been changed
 =====================
 - Only small things like the method names and the loading of the library have changed.
+- The behavior when using the SMTP protocol has been slightly changed. You may not be able to communicate with your SMTP server properly if you use the CI3 settings. See :ref:`email-ssl-tls-for-smtp` and :ref:`email-preferences`.
 
 Upgrade Guide
 =============
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 82439f0cacf6..e539ec6666df 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -102,6 +102,8 @@ The settings used for the last successful send are available from the
 instance property ``$archive``. This is helpful for testing and debugging
 to determine that actual values at the time of the ``send()`` call.
 
+.. _email-preferences:
+
 Email Preferences
 =================
 

From ef98d40276fe9bf2d972644a4213f967b594ad6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 09:05:03 +0900
Subject: [PATCH 295/380] docs: fix description

This setting is for SMTP server hostname.
"Server Address" may be interpreted as a URI.
---
 user_guide_src/source/libraries/email.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index e539ec6666df..c506a9044757 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -117,7 +117,7 @@ Preference          Default Value       Options                      Description
 **protocol**        mail                ``mail``, ``sendmail``,      The mail sending protocol.
                                         or ``smtp``
 **mailPath**        /usr/sbin/sendmail  None                         The server path to Sendmail.
-**SMTPHost**        No Default          None                         SMTP Server Address.
+**SMTPHost**        No Default          None                         SMTP Server Hostname.
 **SMTPUser**        No Default          None                         SMTP Username.
 **SMTPPass**        No Default          None                         SMTP Password.
 **SMTPPort**        25                  None                         SMTP Port. (If set to ``465``, TLS will be used for the connection

From 7e0ddbf7f648281c09c5f6fa84b0b8e3aa0ac672 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 09:09:28 +0900
Subject: [PATCH 296/380] docs: fix doc comments

---
 app/Config/Email.php   | 2 +-
 system/Email/Email.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Config/Email.php b/app/Config/Email.php
index 01b805a5c1fa..4dce650b32ec 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -26,7 +26,7 @@ class Email extends BaseConfig
     public string $mailPath = '/usr/sbin/sendmail';
 
     /**
-     * SMTP Server Address
+     * SMTP Server Hostname
      */
     public string $SMTPHost = '';
 
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 37a5b56be98d..6a7510b1d2a9 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -71,7 +71,7 @@ class Email
     public $protocol = 'mail';
 
     /**
-     * STMP Server host
+     * STMP Server Hostname
      *
      * @var string
      */

From 3f1a71b412a00d359fe546d6e5982d2899d49a05 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Dec 2023 20:37:23 +0900
Subject: [PATCH 297/380] fix: DEPRECATED error in Honeypot

[DEPRECATED] str_ireplace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in SYSTEMPATH\Honeypot\Honeypot.php on line 93.
---
 system/Honeypot/Honeypot.php           | 4 ++++
 tests/system/Honeypot/HoneypotTest.php | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index 82da90020cac..7871a1925832 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -78,6 +78,10 @@ public function hasContent(RequestInterface $request)
      */
     public function attachHoneypot(ResponseInterface $response)
     {
+        if ($response->getBody() === null) {
+            return;
+        }
+
         if ($response->getCSP()->enabled()) {
             // Add id attribute to the container tag.
             $this->config->container = str_ireplace(
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index f3b4a659934f..0ed98e769f50 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -67,6 +67,15 @@ public function testAttachHoneypot(): void
         $this->assertStringNotContainsString($this->config->name, $this->response->getBody());
     }
 
+    public function testAttachHoneypotBodyNull(): void
+    {
+        $this->response->setBody(null);
+
+        $this->honeypot->attachHoneypot($this->response);
+
+        $this->assertNull($this->response->getBody());
+    }
+
     public function testAttachHoneypotAndContainer(): void
     {
         $this->response->setBody('<form></form>');

From 66bb97ce311911a348dc81de8a439f28f8eee413 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 10 Dec 2023 21:29:57 +0900
Subject: [PATCH 298/380] fix: `spark routes` shows incorrect routes when
 translateURIDashes is enabled

---
 .../ControllerMethodReader.php                | 30 +++++++++++++-
 .../ControllerMethodReaderTest.php            | 40 +++++++++++++++++++
 .../Dash_folder/Dash_controller.php           | 27 +++++++++++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Dash_folder/Dash_controller.php

diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
index 6b865226d626..a077633f7011 100644
--- a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved;
 
+use Config\Routing;
 use ReflectionClass;
 use ReflectionMethod;
 
@@ -31,6 +32,8 @@ final class ControllerMethodReader
      */
     private array $httpMethods;
 
+    private bool $translateURIDashes;
+
     /**
      * @param string $namespace the default namespace
      */
@@ -38,6 +41,9 @@ public function __construct(string $namespace, array $httpMethods)
     {
         $this->namespace   = $namespace;
         $this->httpMethods = $httpMethods;
+
+        $config                   = config(Routing::class);
+        $this->translateURIDashes = $config->translateURIDashes;
     }
 
     /**
@@ -67,7 +73,7 @@ public function read(string $class, string $defaultController = 'Home', string $
             foreach ($this->httpMethods as $httpVerb) {
                 if (strpos($methodName, $httpVerb) === 0) {
                     // Remove HTTP verb prefix.
-                    $methodInUri = lcfirst(substr($methodName, strlen($httpVerb)));
+                    $methodInUri = $this->getUriByMethod($httpVerb, $methodName);
 
                     // Check if it is the default method.
                     if ($methodInUri === $defaultMethod) {
@@ -171,7 +177,27 @@ private function getUriByClass(string $classname): string
             $classPath .= lcfirst($part) . '/';
         }
 
-        return rtrim($classPath, '/');
+        $classUri = rtrim($classPath, '/');
+
+        if ($this->translateURIDashes) {
+            $classUri = str_replace('_', '-', $classUri);
+        }
+
+        return $classUri;
+    }
+
+    /**
+     * @return string URI path part from the method
+     */
+    private function getUriByMethod(string $httpVerb, string $methodName): string
+    {
+        $methodUri = lcfirst(substr($methodName, strlen($httpVerb)));
+
+        if ($this->translateURIDashes) {
+            $methodUri = str_replace('_', '-', $methodUri);
+        }
+
+        return $methodUri;
     }
 
     /**
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
index 133d0feff781..6d4a0a5917cc 100644
--- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
+++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
@@ -11,8 +11,11 @@
 
 namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved;
 
+use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Dash_folder\Dash_controller;
 use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Home;
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Test\CIUnitTestCase;
+use Config\Routing;
 use Tests\Support\Controllers\Newautorouting;
 use Tests\Support\Controllers\Remap;
 
@@ -66,6 +69,43 @@ public function testRead(): void
         $this->assertSame($expected, $routes);
     }
 
+    public function testReadTranslateURIDashes(): void
+    {
+        $config                     = config(Routing::class);
+        $config->translateURIDashes = true;
+        Factories::injectMock('config', Routing::class, $config);
+
+        $reader = $this->createControllerMethodReader(
+            'CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers'
+        );
+
+        $routes = $reader->read(Dash_controller::class);
+
+        $expected = [
+            0 => [
+                'method'       => 'get',
+                'route'        => 'dash-folder/dash-controller/somemethod',
+                'route_params' => '[/..]',
+                'handler'      => '\CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Dash_folder\Dash_controller::getSomemethod',
+                'params'       => [
+                    'p1' => false,
+                ],
+            ],
+            [
+                'method'       => 'get',
+                'route'        => 'dash-folder/dash-controller/dash-method',
+                'route_params' => '/..[/..]',
+                'handler'      => '\CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Dash_folder\Dash_controller::getDash_method',
+                'params'       => [
+                    'p1' => true,
+                    'p2' => false,
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, $routes);
+    }
+
     public function testReadDefaultController(): void
     {
         $reader = $this->createControllerMethodReader(
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Dash_folder/Dash_controller.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Dash_folder/Dash_controller.php
new file mode 100644
index 000000000000..486c8529d082
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Dash_folder/Dash_controller.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Dash_folder;
+
+use CodeIgniter\Controller;
+
+class Dash_controller extends Controller
+{
+    public function getSomemethod($p1 = ''): void
+    {
+    }
+
+    public function getDash_method($p1, $p2 = ''): void
+    {
+    }
+}

From 14c3045f35fd7042ba5f712298489caea188f971 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Dec 2023 17:11:19 +0900
Subject: [PATCH 299/380] docs: add missing "method"

---
 user_guide_src/source/models/model.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 5481265231e9..b82aee0300d3 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -738,7 +738,7 @@ points in the model's execution can be affected, each through a class property:
 Defining Callbacks
 ==================
 
-You specify the callbacks by first creating a new class method in your model to use. This class will always
+You specify the callbacks by first creating a new class method in your model to use. This class method will always
 receive a ``$data`` array as its only parameter. The exact contents of the ``$data`` array will vary between events, but
 will always contain a key named **data** that contains the primary data passed to the original method. In the case
 of the insert* or update* methods, that will be the key/value pairs that are being inserted into the database. The

From 2e7399a4d89ee99b7574581be381b8d5b3dcee43 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Dec 2023 17:12:11 +0900
Subject: [PATCH 300/380] docs: improve readability

---
 user_guide_src/source/models/model.rst | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index b82aee0300d3..70e4370df467 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -738,12 +738,20 @@ points in the model's execution can be affected, each through a class property:
 Defining Callbacks
 ==================
 
-You specify the callbacks by first creating a new class method in your model to use. This class method will always
-receive a ``$data`` array as its only parameter. The exact contents of the ``$data`` array will vary between events, but
-will always contain a key named **data** that contains the primary data passed to the original method. In the case
-of the insert* or update* methods, that will be the key/value pairs that are being inserted into the database. The
-main array will also contain the other values passed to the method, and be detailed later. The callback method
-must return the original $data array so other callbacks have the full information.
+You specify the callbacks by first creating a new class method in your model to use.
+
+This class method will always
+receive a ``$data`` array as its only parameter.
+
+The exact contents of the ``$data`` array will vary between events, but
+will always contain a key named ``data`` that contains the primary data passed to the original method.
+In the case
+of the **insert*()** or **update*()** methods, that will be the key/value pairs that are being inserted into the database.
+The
+main ``$data`` array will also contain the other values passed to the method, and be detailed in `Event Parameters`_.
+
+The callback method
+must return the original ``$data`` array so other callbacks have the full information.
 
 .. literalinclude:: model/050.php
 

From fe884ad20b43b114ee4af49799b8c4293a28f049 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Dec 2023 17:25:16 +0900
Subject: [PATCH 301/380] docs: remove unneeded row

There is only one delete() method.
---
 user_guide_src/source/models/model.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 70e4370df467..cf88a0cad44f 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -798,8 +798,7 @@ beforeFind        The name of the calling **method**, whether a **singleton** wa
 - findAll()       **limit** = the number of rows to find.
                   **offset** = the number of rows to skip during the search.
 afterFind         Same as **beforeFind** but including the resulting row(s) of data, or null if no result found.
-beforeDelete      Varies by delete* method. See the following:
-- delete()        **id** = primary key of row being deleted.
+beforeDelete      **id** = primary key of row being deleted.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
 afterDelete       **id** = primary key of row being deleted.
                   **purge** = boolean whether soft-delete rows should be hard deleted.

From 7fdc425d0cf94687d8a2bbf91f7de3e1fed3a689 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Dec 2023 17:25:53 +0900
Subject: [PATCH 302/380] docs: decorate method names

---
 user_guide_src/source/models/model.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index cf88a0cad44f..9b6c67df6a88 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -782,36 +782,36 @@ passed to each event:
 Event             $data contents
 ================= =========================================================================================================
 beforeInsert      **data** = the key/value pairs that are being inserted. If an object or Entity class is passed to the
-                  insert method, it is first converted to an array.
+                  ``insert()`` method, it is first converted to an array.
 afterInsert       **id** = the primary key of the new row, or 0 on failure.
                   **data** = the key/value pairs being inserted.
-                  **result** = the results of the insert() method used through the Query Builder.
+                  **result** = the results of the ``insert()`` method used through the Query Builder.
 beforeUpdate      **id** = the array of primary keys of the rows being updated.
                   **data** = the key/value pairs that are being updated. If an object or Entity class is passed to the
-                  update method, it is first converted to an array.
+                  ``update()`` method, it is first converted to an array.
 afterUpdate       **id** = the array of primary keys of the rows being updated.
                   **data** = the key/value pairs being updated.
-                  **result** = the results of the update() method used through the Query Builder.
+                  **result** = the results of the ``update()`` method used through the Query Builder.
 beforeFind        The name of the calling **method**, whether a **singleton** was requested, and these additional fields:
-- first()         No additional fields
-- find()          **id** = the primary key of the row being searched for.
-- findAll()       **limit** = the number of rows to find.
+- ``first()``     No additional fields
+- ``find()``      **id** = the primary key of the row being searched for.
+- ``findAll()``   **limit** = the number of rows to find.
                   **offset** = the number of rows to skip during the search.
 afterFind         Same as **beforeFind** but including the resulting row(s) of data, or null if no result found.
 beforeDelete      **id** = primary key of row being deleted.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
 afterDelete       **id** = primary key of row being deleted.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
-                  **result** = the result of the delete() call on the Query Builder.
+                  **result** = the result of the ``delete()`` call on the Query Builder.
                   **data** = unused.
 beforeInsertBatch **data** = associative array of values that are being inserted. If an object or Entity class is passed to the
-                  insertBatch method, it is first converted to an array.
+                  ``insertBatch()`` method, it is first converted to an array.
 afterInsertBatch  **data** = the associative array of values being inserted.
-                  **result** = the results of the insertbatch() method used through the Query Builder.
+                  **result** = the results of the ``insertbatch()`` method used through the Query Builder.
 beforeUpdateBatch **data** = associative array of values that are being updated. If an object or Entity class is passed to the
-                  updateBatch method, it is first converted to an array.
+                  ``updateBatch()`` method, it is first converted to an array.
 afterUpdateBatch  **data** = the key/value pairs being updated.
-                  **result** = the results of the updateBatch() method used through the Query Builder.
+                  **result** = the results of the ``updateBatch()`` method used through the Query Builder.
 ================= =========================================================================================================
 
 Modifying Find* Data

From c04a4e71ca6f56b85aaf89ab4dddba84d2ad61e0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Dec 2023 17:34:02 +0900
Subject: [PATCH 303/380] docs: make `id` clearer

---
 user_guide_src/source/models/model.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 9b6c67df6a88..cf9b983d78c4 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -798,9 +798,9 @@ beforeFind        The name of the calling **method**, whether a **singleton** wa
 - ``findAll()``   **limit** = the number of rows to find.
                   **offset** = the number of rows to skip during the search.
 afterFind         Same as **beforeFind** but including the resulting row(s) of data, or null if no result found.
-beforeDelete      **id** = primary key of row being deleted.
+beforeDelete      **id** = primary key of row being passed to the ``delete()`` method.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
-afterDelete       **id** = primary key of row being deleted.
+afterDelete       **id** = primary key of row being passed to the ``delete()`` method.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
                   **result** = the result of the ``delete()`` call on the Query Builder.
                   **data** = unused.

From 242042411171fd09acaf0f7a772a72c48b7d7d69 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 13 Dec 2023 13:15:02 +0800
Subject: [PATCH 304/380] fix: migrations not using custom DB connection of
 migration runner (#8221)

* Add failing test

* Add fix

* Fix setting of group

* Change priority order of migration's db group
---
 phpstan-baseline.php                          |  5 ----
 system/Database/Migration.php                 | 13 ++++----
 system/Database/MigrationRunner.php           | 17 ++++-------
 .../Migrations/MigrationRunnerTest.php        | 30 ++++++++++++++++---
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 8d647f40e497..1493398334c1 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -1146,11 +1146,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/Migration.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\Database\\\\Migration\\:\\:\\$DBGroup \\(string\\) on left side of \\?\\? is not nullable\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Migration.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 8,
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index 1616830f9267..f12509d6264a 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -21,7 +21,7 @@ abstract class Migration
     /**
      * The name of the database group to use.
      *
-     * @var string
+     * @var string|null
      */
     protected $DBGroup;
 
@@ -39,12 +39,15 @@ abstract class Migration
      */
     protected $forge;
 
-    /**
-     * Constructor.
-     */
     public function __construct(?Forge $forge = null)
     {
-        $this->forge = $forge ?? Database::forge($this->DBGroup ?? config(Database::class)->defaultGroup);
+        if (isset($this->DBGroup)) {
+            $this->forge = Database::forge($this->DBGroup);
+        } elseif ($forge !== null) {
+            $this->forge = $forge;
+        } else {
+            $this->forge = Database::forge(config(Database::class)->defaultGroup);
+        }
 
         $this->db = $this->forge->getConnection();
     }
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index a466a91462dc..3a17646ca121 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -135,16 +135,12 @@ public function __construct(MigrationsConfig $config, $db = null)
         $this->enabled = $config->enabled ?? false;
         $this->table   = $config->table ?? 'migrations';
 
-        // Default name space is the app namespace
         $this->namespace = APP_NAMESPACE;
 
-        // get default database group
-        $config      = config(Database::class);
-        $this->group = $config->defaultGroup;
-        unset($config);
+        // Even if a DB connection is passed, since it is a test,
+        // it is assumed to use the default group name
+        $this->group = is_string($db) ? $db : config(Database::class)->defaultGroup;
 
-        // If no db connection passed in, use
-        // default database group.
         $this->db = db_connect($db);
     }
 
@@ -836,8 +832,9 @@ protected function migrate($direction, $migration): bool
             throw new RuntimeException($message);
         }
 
-        $instance = new $class();
-        $group    = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;
+        /** @var Migration $instance */
+        $instance = new $class(Database::forge($this->db));
+        $group    = $instance->getDBGroup() ?? $this->group;
 
         if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
             // @codeCoverageIgnoreStart
@@ -853,8 +850,6 @@ protected function migrate($direction, $migration): bool
             return true;
         }
 
-        $this->setGroup($group);
-
         if (! is_callable([$instance, $direction])) {
             $message = sprintf(lang('Migrations.missingMethod'), $direction);
 
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index a573114c1f94..aac42778b9f8 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Database\Migrations;
 
 use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\Config;
 use CodeIgniter\Database\MigrationRunner;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\ConfigException;
@@ -454,11 +453,34 @@ public function testGetBatchVersions(): void
         $this->assertSame('2018-01-24-102302', $runner->getBatchEnd(1));
     }
 
-    protected function resetTables(): void
+    public function testMigrationUsesSameConnectionAsMigrationRunner(): void
     {
-        $forge = Config::forge();
+        $config = ['database' => WRITEPATH . 'runner.sqlite', 'DBDriver' => 'SQLite3', 'DBDebug' => true];
 
-        foreach (db_connect()->listTables() as $table) {
+        $database = Database::connect($config, false);
+        $this->resetTables($database);
+
+        $runner = new MigrationRunner(config(Migrations::class), $database);
+        $runner->clearCliMessages();
+        $runner->clearHistory();
+        $runner->setNamespace('Tests\Support\MigrationTestMigrations');
+        $runner->latest();
+
+        $tables = $database->listTables();
+        $this->assertCount(2, $tables);
+        $this->assertSame('migrations', $tables[0]);
+        $this->assertSame('foo', $tables[1]);
+    }
+
+    protected function resetTables($db = null): void
+    {
+        $forge = Database::forge($db);
+
+        /** @var BaseConnection $conn */
+        $conn = $forge->getConnection();
+        $conn->resetDataCache();
+
+        foreach (db_connect($db)->listTables() as $table) {
             $table = str_replace('db_', '', $table);
             $forge->dropTable($table, true);
         }

From 753fe0ea0ab8ee4bab0467a3bcf4a97989ce96ba Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
Date: Wed, 13 Dec 2023 20:03:02 +0200
Subject: [PATCH 305/380] Update system/View/ViewDecoratorTrait.php

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/View/ViewDecoratorTrait.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
index da7a57189981..3f52b72a8ab9 100644
--- a/system/View/ViewDecoratorTrait.php
+++ b/system/View/ViewDecoratorTrait.php
@@ -21,7 +21,9 @@ trait ViewDecoratorTrait
      */
     protected function decorateOutput(string $html): string
     {
-        foreach ($this->config->decorators as $decorator) {
+        $decorators = $this->config->decorators ?? \config(ViewConfig::class)->decorators;
+
+        foreach ($decorators as $decorator) {
             if (! is_subclass_of($decorator, ViewDecoratorInterface::class)) {
                 throw ViewException::forInvalidDecorator($decorator);
             }

From 97c4518a4ac5fd2afa1954fabd10479706cd5320 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Dec 2023 16:13:53 +0900
Subject: [PATCH 306/380] docs: just joining lines together nicely

---
 user_guide_src/source/models/model.rst | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index cf9b983d78c4..fdedcc7d15d7 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -740,18 +740,17 @@ Defining Callbacks
 
 You specify the callbacks by first creating a new class method in your model to use.
 
-This class method will always
-receive a ``$data`` array as its only parameter.
-
-The exact contents of the ``$data`` array will vary between events, but
-will always contain a key named ``data`` that contains the primary data passed to the original method.
-In the case
-of the **insert*()** or **update*()** methods, that will be the key/value pairs that are being inserted into the database.
-The
-main ``$data`` array will also contain the other values passed to the method, and be detailed in `Event Parameters`_.
-
-The callback method
-must return the original ``$data`` array so other callbacks have the full information.
+This class method will always receive a ``$data`` array as its only parameter.
+
+The exact contents of the ``$data`` array will vary between events, but will always
+contain a key named ``data`` that contains the primary data passed to the original
+method. In the case of the **insert*()** or **update*()** methods, that will be
+the key/value pairs that are being inserted into the database. The main ``$data``
+array will also contain the other values passed to the method, and be detailed
+in `Event Parameters`_.
+
+The callback method must return the original ``$data`` array so other callbacks
+have the full information.
 
 .. literalinclude:: model/050.php
 

From 181b2d2136a3e7489d14e2a3b535e470e9439138 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Dec 2023 19:39:34 +0900
Subject: [PATCH 307/380] docs: update sample code and descriptions

---
 user_guide_src/source/incoming/routing.rst    | 38 ++++++++++---------
 .../source/incoming/routing/047.php           |  4 --
 .../source/incoming/routing/048.php           |  3 --
 3 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 user_guide_src/source/incoming/routing/047.php
 delete mode 100644 user_guide_src/source/incoming/routing/048.php

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 81304cf25a8c..bb501ba6cc0d 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -740,7 +740,7 @@ See :ref:`Auto Routing in Controllers <controller-auto-routing-improved>` for mo
 Configuration Options
 =====================
 
-These options are available at the top of **app/Config/Routes.php**.
+These options are available at the top of **app/Config/Routing.php**.
 
 Default Controller
 ------------------
@@ -748,13 +748,14 @@ Default Controller
 For Site Root URI
 ^^^^^^^^^^^^^^^^^
 
-When a user visits the root of your site (i.e., **example.com**) the controller to use is determined by the value set by
-the ``setDefaultController()`` method, unless a route exists for it explicitly.
+When a user visits the root of your site (i.e., **example.com**) the controller
+to use is determined by the value set to the ``$defaultController`` property,
+unless a route exists for it explicitly.
 
-The default value for this is ``Home``
-which matches the controller at **app/Controllers/Home.php**:
+The default value for this is ``Home`` which matches the controller at
+**app/Controllers/Home.php**::
 
-.. literalinclude:: routing/047.php
+    public string $defaultController = 'Home';
 
 For Directory URI
 ^^^^^^^^^^^^^^^^^
@@ -775,10 +776,10 @@ This works similar to the default controller setting, but is used to determine t
 when a controller is found that matches the URI, but no segment exists for the method. The default value is
 ``index``.
 
-In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
-``Products::getListAll()`` method would be executed:
+In this example, if the user were to visit **example.com/products**, and a ``Products``
+controller existed, the ``Products::getListAll()`` method would be executed::
 
-.. literalinclude:: routing/048.php
+    public string $defaultMethod = 'listAll';
 
 .. important:: You cannot access the controller with the URI of the default method name.
     In the example above, you can access **example.com/products**, but if you access **example.com/products/listall**, it will be not found.
@@ -868,7 +869,7 @@ See :ref:`Auto Routing (Legacy) in Controllers <controller-auto-routing-legacy>`
 Configuration Options (Legacy)
 ==============================
 
-These options are available at the top of **app/Config/Routes.php**.
+These options are available at the top of **app/Config/Routing.php**.
 
 Default Controller (Legacy)
 ---------------------------
@@ -876,11 +877,14 @@ Default Controller (Legacy)
 For Site Root URI (Legacy)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
-the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
-which matches the controller at **app/Controllers/Home.php**:
+When a user visits the root of your site (i.e., **example.com**) the controller
+to use is determined by the value set to the ``$defaultController`` property,
+unless a route exists for it explicitly.
 
-.. literalinclude:: routing/047.php
+The default value for this is ``Home`` which matches the controller at
+**app/Controllers/Home.php**::
+
+    public string $defaultController = 'Home';
 
 For Directory URI (Legacy)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -898,10 +902,10 @@ This works similar to the default controller setting, but is used to determine t
 when a controller is found that matches the URI, but no segment exists for the method. The default value is
 ``index``.
 
-In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
-``Products::listAll()`` method would be executed:
+In this example, if the user were to visit **example.com/products**, and a ``Products``
+controller existed, the ``Products::listAll()`` method would be executed::
 
-.. literalinclude:: routing/048.php
+    public string $defaultMethod = 'listAll';
 
 Confirming Routes
 *****************
diff --git a/user_guide_src/source/incoming/routing/047.php b/user_guide_src/source/incoming/routing/047.php
deleted file mode 100644
index d8ff31b84493..000000000000
--- a/user_guide_src/source/incoming/routing/047.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-// example.com routes to app/Controllers/Home.php
-$routes->setDefaultController('Home');
diff --git a/user_guide_src/source/incoming/routing/048.php b/user_guide_src/source/incoming/routing/048.php
deleted file mode 100644
index e926e651287d..000000000000
--- a/user_guide_src/source/incoming/routing/048.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$routes->setDefaultMethod('listAll');

From 5c4c72c1b8b0bf3089a48ae00e2925dad6425ea2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Dec 2023 20:23:19 +0900
Subject: [PATCH 308/380] docs: update description

---
 user_guide_src/source/incoming/routing.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index bb501ba6cc0d..b4e0d4e19b0e 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -740,7 +740,7 @@ See :ref:`Auto Routing in Controllers <controller-auto-routing-improved>` for mo
 Configuration Options
 =====================
 
-These options are available at the top of **app/Config/Routing.php**.
+These options are available in the **app/Config/Routing.php** file.
 
 Default Controller
 ------------------
@@ -869,7 +869,7 @@ See :ref:`Auto Routing (Legacy) in Controllers <controller-auto-routing-legacy>`
 Configuration Options (Legacy)
 ==============================
 
-These options are available at the top of **app/Config/Routing.php**.
+These options are available in the **app/Config/Routing.php** file.
 
 Default Controller (Legacy)
 ---------------------------

From 50f763339f915a2afde9f178c82edc51117e9017 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Dec 2023 20:55:51 +0900
Subject: [PATCH 309/380] docs: use validateData() instead of validate()

---
 user_guide_src/source/libraries/validation.rst     | 12 ++++++------
 user_guide_src/source/libraries/validation/001.php |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 497a682d5f0a..41b9fa34f93d 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -147,13 +147,13 @@ To try your form, visit your site using a URL similar to this one::
     example.com/index.php/form/
 
 If you submit the form you should simply see the form reload. That's
-because you haven't set up any validation rules in ``$this->validate()`` yet.
+because you haven't set up any validation rules in :ref:`controller-validatedata` yet.
 
-The ``validate()`` method is a method in the Controller. It uses
-the **Validation class** inside. See :ref:`controllers-validating-data`.
+The ``validateData()`` method is a method in the Controller. It uses
+the **Validation class** inside. See :ref:`controller-validatedata`.
 
-.. note:: Since you haven't told the ``validate()`` method to validate anything
-    yet, it **returns false** (boolean false) **by default**. The ``validate()``
+.. note:: Since you haven't told the ``validateData()`` method to validate anything
+    yet, it **returns false** (boolean false) **by default**. The ``validateData()``
     method only returns true if it has successfully applied your rules without
     any of them failing.
 
@@ -189,7 +189,7 @@ It loads the form helper used by your view files.
 
 The controller has one method: ``index()``. This method returns
 the **signup** view to show the form when a non-POST request comes. Otherwise, it
-uses the Controller-provided ``validate()`` method. It also runs the validation routine.
+uses the Controller-provided :ref:`controller-validatedata` method. It also runs the validation routine.
 Based on whether the validation was successful it either presents the
 form or the success page.
 
diff --git a/user_guide_src/source/libraries/validation/001.php b/user_guide_src/source/libraries/validation/001.php
index e797b21a6ae0..e3aad548607f 100644
--- a/user_guide_src/source/libraries/validation/001.php
+++ b/user_guide_src/source/libraries/validation/001.php
@@ -12,9 +12,13 @@ public function index()
             return view('signup');
         }
 
-        $rules = [];
+        $rules = [
+            // @TODO
+        ];
 
-        if (! $this->validate($rules)) {
+        $data = $this->request->getPost(array_keys($rules));
+
+        if (! $this->validateData($data, $rules)) {
             return view('signup');
         }
 

From 65cb4d56e4130cd8bdc0a83a44d56bb92b08b093 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Dec 2023 10:40:07 +0900
Subject: [PATCH 310/380] docs: update config sample

---
 user_guide_src/source/incoming/controllers.rst   | 16 +++++++++-------
 .../source/incoming/controllers/015.php          |  3 ---
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 user_guide_src/source/incoming/controllers/015.php

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 1f75bc872c9e..16296848f7c1 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -313,16 +313,17 @@ Defining a Default Controller
 
 Let's try it with the ``Helloworld`` controller.
 
-To specify a default controller open your **app/Config/Routes.php**
-file and set this variable:
+To specify a default controller open your **app/Config/Routing.php**
+file and set this property::
 
-.. literalinclude:: controllers/015.php
+    public string $defaultController = 'Helloworld';
 
 Where ``Helloworld`` is the name of the controller class you want to be used.
 
-A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
+And comment out the line in **app/Config/Routes.php**:
 
 .. literalinclude:: controllers/016.php
+    :lines: 2-
 
 If you now browse to your site without specifying any URI segments you'll
 see the "Hello World" message.
@@ -547,15 +548,16 @@ Defining a Default Controller (Legacy)
 Let's try it with the ``Helloworld`` controller.
 
 To specify a default controller open your **app/Config/Routes.php**
-file and set this variable:
+file and set this property::
 
-.. literalinclude:: controllers/015.php
+    public string $defaultController = 'Helloworld';
 
 Where ``Helloworld`` is the name of the controller class you want to be used.
 
-A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
+And comment out the line in **app/Config/Routes.php**:
 
 .. literalinclude:: controllers/016.php
+    :lines: 2-
 
 If you now browse to your site without specifying any URI segments you'll
 see the "Hello World" message.
diff --git a/user_guide_src/source/incoming/controllers/015.php b/user_guide_src/source/incoming/controllers/015.php
deleted file mode 100644
index 2de1b716d040..000000000000
--- a/user_guide_src/source/incoming/controllers/015.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$routes->setDefaultController('Helloworld');

From 9c3f1f763b8adf6952245c2882e8f47b01b27ba8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Dec 2023 10:40:40 +0900
Subject: [PATCH 311/380] docs: remove incorrect links

---
 user_guide_src/source/incoming/controllers.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 16296848f7c1..0ba3656b2930 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -333,8 +333,8 @@ see the "Hello World" message.
     precedence over Auto Routing, and controllers defined in the defined routes
     are denied access by Auto Routing (Improved) for security reasons.
 
-For more information, please refer to the :ref:`routes-configuration-options` section of the
-:ref:`URI Routing <routing-auto-routing-improved-configuration-options>` documentation.
+For more information, please refer to the
+:ref:`routing-auto-routing-improved-configuration-options` documentation.
 
 .. _controller-default-method-fallback:
 
@@ -564,8 +564,8 @@ see the "Hello World" message.
 
 .. note:: The line ``$routes->get('/', 'Home::index');`` is an optimization that you will want to use in a "real-world" app. But for demonstration purposes we don't want to use that feature. ``$routes->get()`` is explained in :doc:`URI Routing <routing>`
 
-For more information, please refer to the :ref:`routes-configuration-options` section of the
-:ref:`URI Routing <routing-auto-routing-legacy-configuration-options>` documentation.
+For more information, please refer to the the
+:ref:`routing-auto-routing-legacy-configuration-options` documentation.
 
 Organizing Your Controllers into Sub-directories (Legacy)
 =========================================================

From 6ceb0fb61167b8030be37c2ea8e8371a30df32a0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Dec 2023 11:20:27 +0900
Subject: [PATCH 312/380] docs: update routing config file name

---
 user_guide_src/source/incoming/controllers.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 0ba3656b2930..b1aa0e65a9a5 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -416,7 +416,7 @@ To call the above controller your URI will look something like this::
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller
 in there that matches the name of your default controller as specified in
-your **app/Config/Routes.php** file.
+your **app/Config/Routing.php** file.
 
 CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Routing <defined-route-routing>`..
 
@@ -547,7 +547,7 @@ Defining a Default Controller (Legacy)
 
 Let's try it with the ``Helloworld`` controller.
 
-To specify a default controller open your **app/Config/Routes.php**
+To specify a default controller open your **app/Config/Routing.php**
 file and set this property::
 
     public string $defaultController = 'Helloworld';
@@ -595,7 +595,7 @@ To call the above controller your URI will look something like this::
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller
 in there that matches the name of your default controller as specified in
-your **app/Config/Routes.php** file.
+your **app/Config/Routing.php** file.
 
 CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Routing <defined-route-routing>`..
 

From fc17a538cba8af78f04b3c7d81f1f3f0b2cb5782 Mon Sep 17 00:00:00 2001
From: Michal Sniatala <michal@sniatala.pl>
Date: Fri, 15 Dec 2023 09:16:05 +0100
Subject: [PATCH 313/380] always return a new instance of a cell (#8330)

---
 system/View/Cell.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/View/Cell.php b/system/View/Cell.php
index de9bbe636e4e..141ceaf32f01 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -181,8 +181,7 @@ protected function determineClass(string $library): array
         }
 
         // locate and return an instance of the cell
-        // @TODO extend Factories to be able to load classes with the same short name.
-        $object = class_exists($class) ? new $class() : Factories::cells($class);
+        $object = Factories::cells($class, ['getShared' => false]);
 
         if (! is_object($object)) {
             throw ViewException::forInvalidCellClass($class);

From 5bdf0a2c6609524e0418b0e698fdc2db163cc972 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:32:21 +0000
Subject: [PATCH 314/380] chore(deps): bump actions/download-artifact from 3 to
 4

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/reusable-coveralls.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml
index a5dfc83996cb..32415f80a602 100644
--- a/.github/workflows/reusable-coveralls.yml
+++ b/.github/workflows/reusable-coveralls.yml
@@ -24,7 +24,7 @@ jobs:
           coverage: xdebug
 
       - name: Download coverage files
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: build/cov
 

From 0b1e35594e35c74264814bbf97d840f2385ff9a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:32:24 +0000
Subject: [PATCH 315/380] chore(deps): bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy-userguide-latest.yml           | 2 +-
 .github/workflows/reusable-phpunit-test.yml             | 2 +-
 .github/workflows/reusable-serviceless-phpunit-test.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml
index ab366268e5ee..8c1545286fe9 100644
--- a/.github/workflows/deploy-userguide-latest.yml
+++ b/.github/workflows/deploy-userguide-latest.yml
@@ -48,7 +48,7 @@ jobs:
 
       # Create an artifact of the html output
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: HTML Documentation
           path: user_guide_src/build/html/
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
index 0963f5865242..300f510a0d7f 100644
--- a/.github/workflows/reusable-phpunit-test.yml
+++ b/.github/workflows/reusable-phpunit-test.yml
@@ -206,7 +206,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
index 6371847c77bd..d7d8f4ca8c46 100644
--- a/.github/workflows/reusable-serviceless-phpunit-test.yml
+++ b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -116,7 +116,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

From 0a24c22f23af453a6d8f33c27e51b72eceb1e57e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 16 Dec 2023 10:03:46 +0900
Subject: [PATCH 316/380] docs: add @property to Time

---
 system/I18n/Time.php       | 17 ++++++++++++++++-
 system/I18n/TimeLegacy.php | 16 +++++++++++++++-
 system/I18n/TimeTrait.php  |  2 ++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 520f38eb90d1..9097dcacdb12 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -19,7 +19,22 @@
  *
  * Requires the intl PHP extension.
  *
- * @property string $date
+ * @property int    $age         read-only
+ * @property string $day         read-only
+ * @property string $dayOfWeek   read-only
+ * @property string $dayOfYear   read-only
+ * @property bool   $dst         read-only
+ * @property string $hour        read-only
+ * @property string $minute      read-only
+ * @property string $month       read-only
+ * @property string $quarter     read-only
+ * @property string $second      read-only
+ * @property int    $timestamp   read-only
+ * @property bool   $utc         read-only
+ * @property string $weekOfMonth read-only
+ * @property string $weekOfYear  read-only
+ * @property string $year        read-only
+ *
  * @see \CodeIgniter\I18n\TimeTest
  */
 class Time extends DateTimeImmutable
diff --git a/system/I18n/TimeLegacy.php b/system/I18n/TimeLegacy.php
index 7be9f80fac20..adc35bf51d10 100644
--- a/system/I18n/TimeLegacy.php
+++ b/system/I18n/TimeLegacy.php
@@ -20,7 +20,21 @@
  * This is not immutable! Some methods are immutable,
  * but some methods can alter the state.
  *
- * @property string $date
+ * @property int    $age         read-only
+ * @property string $day         read-only
+ * @property string $dayOfWeek   read-only
+ * @property string $dayOfYear   read-only
+ * @property bool   $dst         read-only
+ * @property string $hour        read-only
+ * @property string $minute      read-only
+ * @property string $month       read-only
+ * @property string $quarter     read-only
+ * @property string $second      read-only
+ * @property int    $timestamp   read-only
+ * @property bool   $utc         read-only
+ * @property string $weekOfMonth read-only
+ * @property string $weekOfYear  read-only
+ * @property string $year        read-only
  *
  * @deprecated Use Time instead.
  * @see \CodeIgniter\I18n\TimeLegacyTest
diff --git a/system/I18n/TimeTrait.php b/system/I18n/TimeTrait.php
index 7f2068b7a30c..da2bf046517b 100644
--- a/system/I18n/TimeTrait.php
+++ b/system/I18n/TimeTrait.php
@@ -1182,6 +1182,8 @@ public function __wakeup(): void
         $timezone = $this->timezone;
 
         $this->timezone = new DateTimeZone($timezone);
+
+        // @phpstan-ignore-next-line `$this->date` is a special property for PHP internal use.
         parent::__construct($this->date, $this->timezone);
     }
 }

From 4efa7df8a8b717eb8abbe29512e777ce22976a65 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 16 Dec 2023 10:26:58 +0900
Subject: [PATCH 317/380] docs: add "use CodeIgniter\I18n\Time;"

---
 user_guide_src/source/libraries/time/002.php | 2 ++
 user_guide_src/source/libraries/time/003.php | 2 ++
 user_guide_src/source/libraries/time/004.php | 2 ++
 user_guide_src/source/libraries/time/005.php | 2 ++
 user_guide_src/source/libraries/time/006.php | 2 ++
 user_guide_src/source/libraries/time/007.php | 2 ++
 user_guide_src/source/libraries/time/008.php | 2 ++
 user_guide_src/source/libraries/time/009.php | 2 ++
 user_guide_src/source/libraries/time/010.php | 2 ++
 user_guide_src/source/libraries/time/011.php | 2 ++
 user_guide_src/source/libraries/time/012.php | 2 ++
 user_guide_src/source/libraries/time/013.php | 2 ++
 user_guide_src/source/libraries/time/014.php | 2 ++
 user_guide_src/source/libraries/time/015.php | 2 ++
 user_guide_src/source/libraries/time/016.php | 2 ++
 user_guide_src/source/libraries/time/017.php | 2 ++
 user_guide_src/source/libraries/time/018.php | 2 ++
 user_guide_src/source/libraries/time/019.php | 2 ++
 user_guide_src/source/libraries/time/020.php | 2 ++
 user_guide_src/source/libraries/time/021.php | 2 ++
 user_guide_src/source/libraries/time/022.php | 2 ++
 user_guide_src/source/libraries/time/023.php | 2 ++
 user_guide_src/source/libraries/time/024.php | 2 ++
 user_guide_src/source/libraries/time/025.php | 2 ++
 user_guide_src/source/libraries/time/026.php | 2 ++
 user_guide_src/source/libraries/time/027.php | 2 ++
 user_guide_src/source/libraries/time/029.php | 2 ++
 user_guide_src/source/libraries/time/030.php | 2 ++
 user_guide_src/source/libraries/time/032.php | 2 ++
 user_guide_src/source/libraries/time/034.php | 2 ++
 user_guide_src/source/libraries/time/035.php | 2 ++
 user_guide_src/source/libraries/time/037.php | 2 ++
 user_guide_src/source/libraries/time/038.php | 2 ++
 user_guide_src/source/libraries/time/039.php | 2 ++
 user_guide_src/source/libraries/time/041.php | 2 ++
 35 files changed, 70 insertions(+)

diff --git a/user_guide_src/source/libraries/time/002.php b/user_guide_src/source/libraries/time/002.php
index 46b84050adc9..ebd5895d86b8 100644
--- a/user_guide_src/source/libraries/time/002.php
+++ b/user_guide_src/source/libraries/time/002.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $myTime = new Time('now', 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/003.php b/user_guide_src/source/libraries/time/003.php
index 4178f420bdd5..f60fd3301c7d 100644
--- a/user_guide_src/source/libraries/time/003.php
+++ b/user_guide_src/source/libraries/time/003.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $myTime = Time::now('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/004.php b/user_guide_src/source/libraries/time/004.php
index 1d31920a6031..cad1176ae007 100644
--- a/user_guide_src/source/libraries/time/004.php
+++ b/user_guide_src/source/libraries/time/004.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $myTime = Time::parse('next Tuesday', 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/005.php b/user_guide_src/source/libraries/time/005.php
index 8f820510cf92..8c139265d105 100644
--- a/user_guide_src/source/libraries/time/005.php
+++ b/user_guide_src/source/libraries/time/005.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $myTime = Time::today('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/006.php b/user_guide_src/source/libraries/time/006.php
index 79ec74a63519..28ca0ab4b86a 100644
--- a/user_guide_src/source/libraries/time/006.php
+++ b/user_guide_src/source/libraries/time/006.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $myTime = Time::yesterday('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/007.php b/user_guide_src/source/libraries/time/007.php
index 03eacf76f313..06b0db236d4e 100644
--- a/user_guide_src/source/libraries/time/007.php
+++ b/user_guide_src/source/libraries/time/007.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $myTime = Time::tomorrow('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/008.php b/user_guide_src/source/libraries/time/008.php
index d145eabdea83..04ba24d36651 100644
--- a/user_guide_src/source/libraries/time/008.php
+++ b/user_guide_src/source/libraries/time/008.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $today       = Time::createFromDate();     // Uses current year, month, and day
 $anniversary = Time::createFromDate(2018); // Uses current month and day
 $date        = Time::createFromDate(2018, 3, 15, 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/009.php b/user_guide_src/source/libraries/time/009.php
index 5bff03093c94..40ff388d27dd 100644
--- a/user_guide_src/source/libraries/time/009.php
+++ b/user_guide_src/source/libraries/time/009.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $lunch  = Time::createFromTime(11, 30);     // 11:30 am today
 $dinner = Time::createFromTime(18, 00, 00); // 6:00 pm today
 $time   = Time::createFromTime($hour, $minutes, $seconds, $timezone, $locale);
diff --git a/user_guide_src/source/libraries/time/010.php b/user_guide_src/source/libraries/time/010.php
index aa9b0f5d7d1f..18b07eb95ea7 100644
--- a/user_guide_src/source/libraries/time/010.php
+++ b/user_guide_src/source/libraries/time/010.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time = Time::create($year, $month, $day, $hour, $minutes, $seconds, $timezone, $locale);
diff --git a/user_guide_src/source/libraries/time/011.php b/user_guide_src/source/libraries/time/011.php
index 912fb0666fa6..268d63d9b4d9 100644
--- a/user_guide_src/source/libraries/time/011.php
+++ b/user_guide_src/source/libraries/time/011.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time = Time::createFromFormat('j-M-Y', '15-Feb-2009', 'America/Chicago');
diff --git a/user_guide_src/source/libraries/time/012.php b/user_guide_src/source/libraries/time/012.php
index 951717d05db6..18e8f9e011dc 100644
--- a/user_guide_src/source/libraries/time/012.php
+++ b/user_guide_src/source/libraries/time/012.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time = Time::createFromTimestamp(1501821586, 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/013.php b/user_guide_src/source/libraries/time/013.php
index 87d19cbb48fb..2e0c52ff1f58 100644
--- a/user_guide_src/source/libraries/time/013.php
+++ b/user_guide_src/source/libraries/time/013.php
@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $dt   = new DateTime('now');
 $time = Time::createFromInstance($dt, 'en_US');
diff --git a/user_guide_src/source/libraries/time/014.php b/user_guide_src/source/libraries/time/014.php
index 62332644e388..aebf92600b51 100644
--- a/user_guide_src/source/libraries/time/014.php
+++ b/user_guide_src/source/libraries/time/014.php
@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $datetime = Time::toDateTime();
diff --git a/user_guide_src/source/libraries/time/015.php b/user_guide_src/source/libraries/time/015.php
index 0545c0247cc3..0a5f7ce02d53 100644
--- a/user_guide_src/source/libraries/time/015.php
+++ b/user_guide_src/source/libraries/time/015.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 // Locale: en
 $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 echo $time->toLocalizedString('MMM d, yyyy'); // March 9, 2016
diff --git a/user_guide_src/source/libraries/time/016.php b/user_guide_src/source/libraries/time/016.php
index 0645fd9b49ce..fe67508a4743 100644
--- a/user_guide_src/source/libraries/time/016.php
+++ b/user_guide_src/source/libraries/time/016.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 // Locale: en
 $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 echo $time->toDateTimeString(); // 2016-03-09 12:00:00
diff --git a/user_guide_src/source/libraries/time/017.php b/user_guide_src/source/libraries/time/017.php
index c0283d9d2e90..6047929bd310 100644
--- a/user_guide_src/source/libraries/time/017.php
+++ b/user_guide_src/source/libraries/time/017.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 // Locale: en
 $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 echo $time->toDateString(); // 2016-03-09
diff --git a/user_guide_src/source/libraries/time/018.php b/user_guide_src/source/libraries/time/018.php
index d3001a7749f4..b53dd96999c3 100644
--- a/user_guide_src/source/libraries/time/018.php
+++ b/user_guide_src/source/libraries/time/018.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 // Locale: en
 $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 echo $time->toTimeString(); // 12:00:00
diff --git a/user_guide_src/source/libraries/time/019.php b/user_guide_src/source/libraries/time/019.php
index 50088537061c..cc355921289d 100644
--- a/user_guide_src/source/libraries/time/019.php
+++ b/user_guide_src/source/libraries/time/019.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 // Assume current time is: March 10, 2017 (America/Chicago)
 $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 
diff --git a/user_guide_src/source/libraries/time/020.php b/user_guide_src/source/libraries/time/020.php
index 8d83bcaf5747..2164d155340b 100644
--- a/user_guide_src/source/libraries/time/020.php
+++ b/user_guide_src/source/libraries/time/020.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time = Time::parse('August 12, 2016 4:15:23pm');
 
 echo $time->getYear();   // 2016
diff --git a/user_guide_src/source/libraries/time/021.php b/user_guide_src/source/libraries/time/021.php
index a3e0f128c5d7..6b17aa4c1c65 100644
--- a/user_guide_src/source/libraries/time/021.php
+++ b/user_guide_src/source/libraries/time/021.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time = Time::parse('August 12, 2016 4:15:23pm');
 
 echo $time->getDayOfWeek();   // 6 - but may vary based on locale's starting day of the week
diff --git a/user_guide_src/source/libraries/time/022.php b/user_guide_src/source/libraries/time/022.php
index facfdc5a9d02..deda59e0b0c3 100644
--- a/user_guide_src/source/libraries/time/022.php
+++ b/user_guide_src/source/libraries/time/022.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time = Time::parse('5 years ago');
 
 echo $time->getAge(); // 5
diff --git a/user_guide_src/source/libraries/time/023.php b/user_guide_src/source/libraries/time/023.php
index 970aaad45d76..9f0b0803eda4 100644
--- a/user_guide_src/source/libraries/time/023.php
+++ b/user_guide_src/source/libraries/time/023.php
@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 echo Time::createFromDate(2012, 1, 1)->getDst(); // false
 echo Time::createFromDate(2012, 9, 1)->dst;      // true
diff --git a/user_guide_src/source/libraries/time/024.php b/user_guide_src/source/libraries/time/024.php
index 1919e1d097cf..64454ca91bfe 100644
--- a/user_guide_src/source/libraries/time/024.php
+++ b/user_guide_src/source/libraries/time/024.php
@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 echo Time::now()->getLocal();    // true
 echo Time::now('Europe/London'); // false
diff --git a/user_guide_src/source/libraries/time/025.php b/user_guide_src/source/libraries/time/025.php
index b25d5de4aef9..50b14fdc507f 100644
--- a/user_guide_src/source/libraries/time/025.php
+++ b/user_guide_src/source/libraries/time/025.php
@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 echo Time::now('America/Chicago')->getUtc(); // false
 echo Time::now('UTC')->utc;                  // true
diff --git a/user_guide_src/source/libraries/time/026.php b/user_guide_src/source/libraries/time/026.php
index 030102f72d70..2aff6825c8fd 100644
--- a/user_guide_src/source/libraries/time/026.php
+++ b/user_guide_src/source/libraries/time/026.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $tz = Time::now()->getTimezone();
 $tz = Time::now()->timezone;
 
diff --git a/user_guide_src/source/libraries/time/027.php b/user_guide_src/source/libraries/time/027.php
index dde3a39bec92..666bbd2798e2 100644
--- a/user_guide_src/source/libraries/time/027.php
+++ b/user_guide_src/source/libraries/time/027.php
@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 echo Time::now('America/Chicago')->getTimezoneName(); // America/Chicago
 echo Time::now('Europe/London')->timezoneName;        // Europe/London
diff --git a/user_guide_src/source/libraries/time/029.php b/user_guide_src/source/libraries/time/029.php
index d65f408fe05d..fbff5ab5fe98 100644
--- a/user_guide_src/source/libraries/time/029.php
+++ b/user_guide_src/source/libraries/time/029.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time  = Time::parse('13 May 2020 10:00', 'America/Chicago');
 $time2 = $time->setTimezone('Europe/London'); // Returns new instance converted to new timezone
 
diff --git a/user_guide_src/source/libraries/time/030.php b/user_guide_src/source/libraries/time/030.php
index 243416cbbdb5..1e22876e9883 100644
--- a/user_guide_src/source/libraries/time/030.php
+++ b/user_guide_src/source/libraries/time/030.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time  = Time::parse('May 10, 2017', 'America/Chicago');
 $time2 = $time->setTimestamp(strtotime('April 1, 2017'));
 
diff --git a/user_guide_src/source/libraries/time/032.php b/user_guide_src/source/libraries/time/032.php
index 9207945c5242..ce6490e3243a 100644
--- a/user_guide_src/source/libraries/time/032.php
+++ b/user_guide_src/source/libraries/time/032.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
 $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
 
diff --git a/user_guide_src/source/libraries/time/034.php b/user_guide_src/source/libraries/time/034.php
index 229dfe82c094..bf14f31ebada 100644
--- a/user_guide_src/source/libraries/time/034.php
+++ b/user_guide_src/source/libraries/time/034.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
 $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
 
diff --git a/user_guide_src/source/libraries/time/035.php b/user_guide_src/source/libraries/time/035.php
index e21714c2f2ef..5b31605a00e7 100644
--- a/user_guide_src/source/libraries/time/035.php
+++ b/user_guide_src/source/libraries/time/035.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
 $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
 
diff --git a/user_guide_src/source/libraries/time/037.php b/user_guide_src/source/libraries/time/037.php
index 103d228e1bc3..cb6abda7f960 100644
--- a/user_guide_src/source/libraries/time/037.php
+++ b/user_guide_src/source/libraries/time/037.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
 $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
 
diff --git a/user_guide_src/source/libraries/time/038.php b/user_guide_src/source/libraries/time/038.php
index 880bf193a590..8eda0d1ff688 100644
--- a/user_guide_src/source/libraries/time/038.php
+++ b/user_guide_src/source/libraries/time/038.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $time = Time::parse('March 10, 2017', 'America/Chicago');
 
 $diff = $time->difference(Time::now());
diff --git a/user_guide_src/source/libraries/time/039.php b/user_guide_src/source/libraries/time/039.php
index 12cc3d638f2c..9c31042b668b 100644
--- a/user_guide_src/source/libraries/time/039.php
+++ b/user_guide_src/source/libraries/time/039.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $current = Time::parse('March 10, 2017', 'America/Chicago');
 $test    = Time::parse('March 10, 2010', 'America/Chicago');
 
diff --git a/user_guide_src/source/libraries/time/041.php b/user_guide_src/source/libraries/time/041.php
index 754e1e25a58d..8e97fe3bbb26 100644
--- a/user_guide_src/source/libraries/time/041.php
+++ b/user_guide_src/source/libraries/time/041.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\I18n\Time;
+
 $current = Time::parse('March 10, 2017', 'America/Chicago');
 $test    = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 

From 0a94fea4a22a430e9e02e3999c7bc32650c8d238 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 16 Dec 2023 10:29:39 +0900
Subject: [PATCH 318/380] docs: fix commnets in sample code

---
 user_guide_src/source/libraries/time/020.php | 25 ++++++++++----------
 user_guide_src/source/libraries/time/021.php | 23 +++++++++---------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/user_guide_src/source/libraries/time/020.php b/user_guide_src/source/libraries/time/020.php
index 2164d155340b..a35758a4343f 100644
--- a/user_guide_src/source/libraries/time/020.php
+++ b/user_guide_src/source/libraries/time/020.php
@@ -4,16 +4,17 @@
 
 $time = Time::parse('August 12, 2016 4:15:23pm');
 
-echo $time->getYear();   // 2016
-echo $time->getMonth();  // 8
-echo $time->getDay();    // 12
-echo $time->getHour();   // 16
-echo $time->getMinute(); // 15
-echo $time->getSecond(); // 23
+// The output may vary based on locale.
+echo $time->getYear();   // '2016'
+echo $time->getMonth();  // '8'
+echo $time->getDay();    // '12'
+echo $time->getHour();   // '16'
+echo $time->getMinute(); // '15'
+echo $time->getSecond(); // '23'
 
-echo $time->year;   // 2016
-echo $time->month;  // 8
-echo $time->day;    // 12
-echo $time->hour;   // 16
-echo $time->minute; // 15
-echo $time->second; // 23
+echo $time->year;   // '2016'
+echo $time->month;  // '8'
+echo $time->day;    // '12'
+echo $time->hour;   // '16'
+echo $time->minute; // '15'
+echo $time->second; // '23'
diff --git a/user_guide_src/source/libraries/time/021.php b/user_guide_src/source/libraries/time/021.php
index 6b17aa4c1c65..fb384942c7f7 100644
--- a/user_guide_src/source/libraries/time/021.php
+++ b/user_guide_src/source/libraries/time/021.php
@@ -4,16 +4,17 @@
 
 $time = Time::parse('August 12, 2016 4:15:23pm');
 
-echo $time->getDayOfWeek();   // 6 - but may vary based on locale's starting day of the week
-echo $time->getDayOfYear();   // 225
-echo $time->getWeekOfMonth(); // 2
-echo $time->getWeekOfYear();  // 33
-echo $time->getTimestamp();   // 1471018523 - UNIX timestamp
-echo $time->getQuarter();     // 3
+// The output may vary based on locale.
+echo $time->getDayOfWeek();   // '6'
+echo $time->getDayOfYear();   // '225'
+echo $time->getWeekOfMonth(); // '2'
+echo $time->getWeekOfYear();  // '33'
+echo $time->getTimestamp();   // 1471018523 - UNIX timestamp (locale independent)
+echo $time->getQuarter();     // '3'
 
-echo $time->dayOfWeek;   // 6
-echo $time->dayOfYear;   // 225
-echo $time->weekOfMonth; // 2
-echo $time->weekOfYear;  // 33
+echo $time->dayOfWeek;   // '6'
+echo $time->dayOfYear;   // '225'
+echo $time->weekOfMonth; // '2'
+echo $time->weekOfYear;  // '33'
 echo $time->timestamp;   // 1471018523
-echo $time->quarter;     // 3
+echo $time->quarter;     // '3'

From 73053d3a270bb26d4a09e6141f445e49e60152ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 16 Dec 2023 10:39:12 +0900
Subject: [PATCH 319/380] docs: fix incorrect sample code

---
 user_guide_src/source/libraries/time/024.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/time/024.php b/user_guide_src/source/libraries/time/024.php
index 64454ca91bfe..ab73eb62cb0b 100644
--- a/user_guide_src/source/libraries/time/024.php
+++ b/user_guide_src/source/libraries/time/024.php
@@ -2,5 +2,5 @@
 
 use CodeIgniter\I18n\Time;
 
-echo Time::now()->getLocal();    // true
-echo Time::now('Europe/London'); // false
+echo Time::now()->getLocal();           // true
+echo Time::now('Europe/London')->local; // false

From c39961a44631897b12adbffe598425e97a4ad796 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 16 Dec 2023 10:44:13 +0900
Subject: [PATCH 320/380] docs: add @property $local

---
 system/I18n/Time.php       | 1 +
 system/I18n/TimeLegacy.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 9097dcacdb12..f01718aac6e0 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -25,6 +25,7 @@
  * @property string $dayOfYear   read-only
  * @property bool   $dst         read-only
  * @property string $hour        read-only
+ * @property bool   $local       read-only
  * @property string $minute      read-only
  * @property string $month       read-only
  * @property string $quarter     read-only
diff --git a/system/I18n/TimeLegacy.php b/system/I18n/TimeLegacy.php
index adc35bf51d10..35523e322475 100644
--- a/system/I18n/TimeLegacy.php
+++ b/system/I18n/TimeLegacy.php
@@ -26,6 +26,7 @@
  * @property string $dayOfYear   read-only
  * @property bool   $dst         read-only
  * @property string $hour        read-only
+ * @property bool   $local       read-only
  * @property string $minute      read-only
  * @property string $month       read-only
  * @property string $quarter     read-only

From 4609ed7b686a77d38a9d811ec31a08c9c9aeeaf1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 09:08:19 +0900
Subject: [PATCH 321/380] docs: fix classname to match description

---
 user_guide_src/source/incoming/routing/011.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing/011.php b/user_guide_src/source/incoming/routing/011.php
index 2b5433da8d67..1aa779af3494 100644
--- a/user_guide_src/source/incoming/routing/011.php
+++ b/user_guide_src/source/incoming/routing/011.php
@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-class ProductController extends BaseController
+class Catalog extends BaseController
 {
     public function productLookup($seg1 = false, $seg2 = false, $seg3 = false)
     {

From 87eaa9838905d197f18cbf0c21038ce3c0309e9e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 09:11:29 +0900
Subject: [PATCH 322/380] docs: add missing $prioritize

---
 user_guide_src/source/incoming/routing/052.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/user_guide_src/source/incoming/routing/052.php b/user_guide_src/source/incoming/routing/052.php
index e3dd9f60c989..a8cb8b4ca344 100644
--- a/user_guide_src/source/incoming/routing/052.php
+++ b/user_guide_src/source/incoming/routing/052.php
@@ -1,5 +1,13 @@
 <?php
 
+// In app/Config/Routing.php
+class Routing extends BaseRouting
+{
+    // ...
+    public bool $prioritize = true;
+    // ...
+}
+
 // to enable
 $routes->setPrioritize();
 

From a5ee50c5adb239dbeae744cf8e0e1a4cc7f6d417 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 09:17:03 +0900
Subject: [PATCH 323/380] docs: add "app/Config/Routes.php" in comments

---
 user_guide_src/source/incoming/routing/045.php | 1 +
 user_guide_src/source/incoming/routing/046.php | 2 +-
 user_guide_src/source/incoming/routing/049.php | 2 +-
 user_guide_src/source/incoming/routing/050.php | 2 +-
 user_guide_src/source/incoming/routing/051.php | 1 +
 user_guide_src/source/incoming/routing/052.php | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/incoming/routing/045.php b/user_guide_src/source/incoming/routing/045.php
index e9534931dbc8..8c4c5e9616ee 100644
--- a/user_guide_src/source/incoming/routing/045.php
+++ b/user_guide_src/source/incoming/routing/045.php
@@ -8,6 +8,7 @@ class Routing extends BaseRouting
     // ...
 }
 
+// In app/Config/Routes.php
 // Controller is \Users
 $routes->get('users', 'Users::index');
 
diff --git a/user_guide_src/source/incoming/routing/046.php b/user_guide_src/source/incoming/routing/046.php
index 8998fe70c039..78768c76044a 100644
--- a/user_guide_src/source/incoming/routing/046.php
+++ b/user_guide_src/source/incoming/routing/046.php
@@ -1,6 +1,6 @@
 <?php
 
-// This can be overridden in the Routes file
+// This can be overridden in app/Config/Routes.php
 $routes->setDefaultNamespace('App');
 
 // Controller is \App\Users
diff --git a/user_guide_src/source/incoming/routing/049.php b/user_guide_src/source/incoming/routing/049.php
index 9f53bee87476..ea10d4e5b0fe 100644
--- a/user_guide_src/source/incoming/routing/049.php
+++ b/user_guide_src/source/incoming/routing/049.php
@@ -8,5 +8,5 @@ class Routing extends BaseRouting
     // ...
 }
 
-// This can be overridden in the Routes file
+// This can be overridden in app/Config/Routes.php
 $routes->setTranslateURIDashes(true);
diff --git a/user_guide_src/source/incoming/routing/050.php b/user_guide_src/source/incoming/routing/050.php
index 6f5446f5a654..155ac633568e 100644
--- a/user_guide_src/source/incoming/routing/050.php
+++ b/user_guide_src/source/incoming/routing/050.php
@@ -8,5 +8,5 @@ class Routing extends BaseRouting
     // ...
 }
 
-// This can be overridden in the Routes file
+// This can be overridden in app/Config/Routes.php
 $routes->setAutoRoute(false);
diff --git a/user_guide_src/source/incoming/routing/051.php b/user_guide_src/source/incoming/routing/051.php
index bced5d53147a..c84acce93d4b 100644
--- a/user_guide_src/source/incoming/routing/051.php
+++ b/user_guide_src/source/incoming/routing/051.php
@@ -8,6 +8,7 @@ class Routing extends BaseRouting
     // ...
 }
 
+// In app/Config/Routes.php
 // Would execute the show404 method of the App\Errors class
 $routes->set404Override('App\Errors::show404');
 
diff --git a/user_guide_src/source/incoming/routing/052.php b/user_guide_src/source/incoming/routing/052.php
index a8cb8b4ca344..d9fb5998c21d 100644
--- a/user_guide_src/source/incoming/routing/052.php
+++ b/user_guide_src/source/incoming/routing/052.php
@@ -8,6 +8,7 @@ class Routing extends BaseRouting
     // ...
 }
 
+// In app/Config/Routes.php
 // to enable
 $routes->setPrioritize();
 

From 1e8dfe0ed4ca93fc8914b7b92761eb24dea48bcb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 09:20:15 +0900
Subject: [PATCH 324/380] docs: add sample code with variable-length argument
 lists

For multiple URI segments matched a placeholder.
---
 user_guide_src/source/incoming/routing.rst     | 12 ++++++++++++
 user_guide_src/source/incoming/routing/068.php | 13 +++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 user_guide_src/source/incoming/routing/068.php

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index b4e0d4e19b0e..c9bd1e9eeb39 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -200,11 +200,19 @@ For example the route:
 
 will match **product/123**, **product/123/456**, **product/123/456/789** and so on.
 
+In the above example, if the ``$1`` placeholder contains a slash
+(``/``), it will still be split into multiple parameters when passed to
+``Catalog::productLookup()``.
+
 The implementation in the
 Controller should take into account the maximum parameters:
 
 .. literalinclude:: routing/011.php
 
+Or you can use `variable-length argument lists <https://www.php.net/manual/en/functions.arguments.php#functions.variable-arg-list>`_:
+
+.. literalinclude:: routing/068.php
+
 .. important:: Do not put any placeholder after ``(:any)``. Because the number of
     parameters passed to the controller method may change.
 
@@ -249,6 +257,10 @@ redirect them back to the same page after they log in, you may find this example
 
 .. literalinclude:: routing/019.php
 
+In the above example, if the ``$1`` placeholder contains a slash
+(``/``), it will still be split into multiple parameters when passed to
+``Auth::login()``.
+
 For those of you who don't know regular expressions and want to learn more about them,
 `regular-expressions.info <https://www.regular-expressions.info/>`_ might be a good starting point.
 
diff --git a/user_guide_src/source/incoming/routing/068.php b/user_guide_src/source/incoming/routing/068.php
new file mode 100644
index 000000000000..50b0891ce928
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/068.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Controllers;
+
+class Catalog extends BaseController
+{
+    public function productLookup(...$params)
+    {
+        echo $params[0] ?? null; // Will be 123 in all examples
+        echo $params[1] ?? null; // null in first, 456 in second and third example
+        echo $params[2] ?? null; // null in first and second, 789 in third
+    }
+}

From e9d1fcf98639cf61cd97b0ad4fdd67a05d4668e4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 17:30:15 +0900
Subject: [PATCH 325/380] chore: add SimplifyEmptyCheckOnEmptyArrayRector

---
 rector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rector.php b/rector.php
index cfc84104456e..65f5b8fcbec9 100644
--- a/rector.php
+++ b/rector.php
@@ -11,6 +11,7 @@
 
 use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
 use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
+use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
@@ -137,6 +138,7 @@
     $rectorConfig->rule(FuncGetArgsToVariadicParamRector::class);
     $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
+    $rectorConfig->rule(SimplifyEmptyCheckOnEmptyArrayRector::class);
     $rectorConfig->rule(StringClassNameToClassConstantRector::class);
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);

From cec682b049e48e96063cec501867f39cea4b6591 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 17:32:04 +0900
Subject: [PATCH 326/380] refactor: apply SimplifyEmptyCheckOnEmptyArrayRector

---
 system/Autoloader/FileLocator.php            |  6 +++---
 system/BaseModel.php                         | 12 ++++++------
 system/CLI/BaseCommand.php                   |  6 +++---
 system/CLI/CLI.php                           | 10 +++++-----
 system/Controller.php                        |  2 +-
 system/Database/BaseResult.php               | 16 ++++++++--------
 system/Database/MigrationRunner.php          |  4 ++--
 system/Database/MySQLi/Builder.php           |  2 +-
 system/Database/SQLSRV/Builder.php           | 10 +++++-----
 system/Database/SQLSRV/Forge.php             |  2 +-
 system/Database/SQLite3/Table.php            |  2 +-
 system/Debug/Iterator.php                    |  2 +-
 system/Debug/Toolbar.php                     |  6 +++---
 system/Debug/Toolbar/Collectors/Database.php |  2 +-
 system/Debug/Toolbar/Collectors/History.php  |  2 +-
 system/Entity/Entity.php                     |  2 +-
 system/HTTP/CLIRequest.php                   |  2 +-
 system/HTTP/ContentSecurityPolicy.php        |  4 ++--
 system/HTTP/Files/FileCollection.php         |  2 +-
 system/HTTP/Negotiate.php                    |  2 +-
 system/HTTP/ResponseTrait.php                |  2 +-
 system/Helpers/array_helper.php              |  4 ++--
 system/Helpers/form_helper.php               |  6 +++---
 system/Helpers/html_helper.php               |  2 +-
 system/Helpers/text_helper.php               |  4 ++--
 system/Helpers/url_helper.php                |  2 +-
 system/Log/Logger.php                        |  2 +-
 system/Model.php                             |  4 ++--
 system/Router/AutoRouter.php                 |  6 +++---
 system/Router/Router.php                     |  2 +-
 system/Session/Handlers/MemcachedHandler.php |  2 +-
 system/Session/Session.php                   |  2 +-
 system/Test/DOMParser.php                    |  2 +-
 system/Validation/DotArrayFilter.php         |  2 +-
 system/Validation/Rules.php                  |  6 +++---
 system/View/Parser.php                       |  6 +++---
 system/View/Plugins.php                      |  2 +-
 system/View/Table.php                        |  4 ++--
 38 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 92381a7ee25b..e9ce492c54d6 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -196,7 +196,7 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
             }
         }
 
-        if (! $prioritizeApp && ! empty($appPaths)) {
+        if (! $prioritizeApp && $appPaths !== []) {
             $foundPaths = [...$foundPaths, ...$appPaths];
         }
 
@@ -322,7 +322,7 @@ public function listFiles(string $path): array
 
             $tempFiles = get_filenames($fullPath, true, false, false);
 
-            if (! empty($tempFiles)) {
+            if ($tempFiles !== []) {
                 $files = array_merge($files, $tempFiles);
             }
         }
@@ -356,7 +356,7 @@ public function listNamespaceFiles(string $prefix, string $path): array
 
             $tempFiles = get_filenames($fullPath, true, false, false);
 
-            if (! empty($tempFiles)) {
+            if ($tempFiles !== []) {
                 $files = array_merge($files, $tempFiles);
             }
         }
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 0d3df3d465a1..fcda6b134498 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -782,7 +782,7 @@ public function insert($row = null, bool $returnID = true)
 
         // doProtectFields() can further remove elements from
         // $row, so we need to check for empty dataset again
-        if (! $this->allowEmptyInserts && empty($row)) {
+        if (! $this->allowEmptyInserts && $row === []) {
             throw DataException::forEmptyDataset('insert');
         }
 
@@ -964,7 +964,7 @@ public function update($id = null, $row = null): bool
 
         // doProtectFields() can further remove elements from
         // $row, so we need to check for empty dataset again
-        if (empty($row)) {
+        if ($row === []) {
             throw DataException::forEmptyDataset('update');
         }
 
@@ -1288,7 +1288,7 @@ protected function doProtectFields(array $row): array
             return $row;
         }
 
-        if (empty($this->allowedFields)) {
+        if ($this->allowedFields === []) {
             throw DataException::forInvalidAllowedFields(static::class);
         }
 
@@ -1510,7 +1510,7 @@ public function validate($row): bool
     {
         $rules = $this->getValidationRules();
 
-        if ($this->skipValidation || empty($rules) || empty($row)) {
+        if ($this->skipValidation || $rules === [] || empty($row)) {
             return true;
         }
 
@@ -1523,7 +1523,7 @@ public function validate($row): bool
 
         // If no data existed that needs validation
         // our job is done here.
-        if (empty($rules)) {
+        if ($rules === []) {
             return true;
         }
 
@@ -1879,7 +1879,7 @@ protected function fillPlaceholders(array $rules, array $data): array
             $replacements['{' . $key . '}'] = $value;
         }
 
-        if (! empty($replacements)) {
+        if ($replacements !== []) {
             foreach ($rules as &$rule) {
                 if (is_array($rule)) {
                     foreach ($rule as &$row) {
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index d837f50dbeef..8101283b908a 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -143,7 +143,7 @@ public function showHelp()
         } else {
             $usage = $this->name;
 
-            if (! empty($this->arguments)) {
+            if ($this->arguments !== []) {
                 $usage .= ' [arguments]';
             }
         }
@@ -156,7 +156,7 @@ public function showHelp()
             CLI::write($this->setPad($this->description, 0, 0, 2));
         }
 
-        if (! empty($this->arguments)) {
+        if ($this->arguments !== []) {
             CLI::newLine();
             CLI::write(lang('CLI.helpArguments'), 'yellow');
             $length = max(array_map('strlen', array_keys($this->arguments)));
@@ -166,7 +166,7 @@ public function showHelp()
             }
         }
 
-        if (! empty($this->options)) {
+        if ($this->options !== []) {
             CLI::newLine();
             CLI::write(lang('CLI.helpOptions'), 'yellow');
             $length = max(array_map('strlen', array_keys($this->options)));
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 50a846a25e05..64b576735486 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -252,7 +252,7 @@ public static function prompt(string $field, $options = null, $validation = null
 
             unset($opts[0]);
 
-            if (empty($opts)) {
+            if ($opts === []) {
                 $extraOutput = $extraOutputDefault;
             } else {
                 $extraOutput  = '[' . $extraOutputDefault . ', ' . implode(', ', $opts) . ']';
@@ -324,7 +324,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
         $opts               = $options;
         unset($opts[0]);
 
-        if (empty($opts)) {
+        if ($opts === []) {
             $extraOutput = $extraOutputDefault;
         } else {
             $optsKey = [];
@@ -1000,7 +1000,7 @@ public static function getOptions(): array
      */
     public static function getOptionString(bool $useLongOpts = false, bool $trim = false): string
     {
-        if (empty(static::$options)) {
+        if (static::$options === []) {
             return '';
         }
 
@@ -1041,7 +1041,7 @@ public static function table(array $tbody, array $thead = [])
         $tableRows = [];
 
         // We need only indexes and not keys
-        if (! empty($thead)) {
+        if ($thead !== []) {
             $tableRows[] = array_values($thead);
         }
 
@@ -1115,7 +1115,7 @@ public static function table(array $tbody, array $thead = [])
             $table .= '| ' . implode(' | ', $tableRows[$row]) . ' |' . PHP_EOL;
 
             // Set the thead and table borders-bottom
-            if (($row === 0 && ! empty($thead)) || ($row + 1 === $totalRows)) {
+            if (($row === 0 && $thead !== []) || ($row + 1 === $totalRows)) {
                 $table .= $cols . PHP_EOL;
             }
         }
diff --git a/system/Controller.php b/system/Controller.php
index c040e1d20a4f..a28a7a59f460 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -132,7 +132,7 @@ protected function cachePage(int $time)
      */
     protected function loadHelpers()
     {
-        if (empty($this->helpers)) {
+        if ($this->helpers === []) {
             return;
         }
 
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 6f6399cfb2fd..b807b0bb7ff0 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -174,7 +174,7 @@ public function getCustomResultObject(string $className)
      */
     public function getResultArray(): array
     {
-        if (! empty($this->resultArray)) {
+        if ($this->resultArray !== []) {
             return $this->resultArray;
         }
 
@@ -214,7 +214,7 @@ public function getResultArray(): array
      */
     public function getResultObject(): array
     {
-        if (! empty($this->resultObject)) {
+        if ($this->resultObject !== []) {
             return $this->resultObject;
         }
 
@@ -323,7 +323,7 @@ public function getCustomRowObject(int $n, string $className)
     public function getRowArray(int $n = 0)
     {
         $result = $this->getResultArray();
-        if (empty($result)) {
+        if ($result === []) {
             return null;
         }
 
@@ -344,7 +344,7 @@ public function getRowArray(int $n = 0)
     public function getRowObject(int $n = 0)
     {
         $result = $this->getResultObject();
-        if (empty($result)) {
+        if ($result === []) {
             return null;
         }
 
@@ -392,7 +392,7 @@ public function getFirstRow(string $type = 'object')
     {
         $result = $this->getResult($type);
 
-        return (empty($result)) ? null : $result[0];
+        return ($result === []) ? null : $result[0];
     }
 
     /**
@@ -404,7 +404,7 @@ public function getLastRow(string $type = 'object')
     {
         $result = $this->getResult($type);
 
-        return (empty($result)) ? null : $result[count($result) - 1];
+        return ($result === []) ? null : $result[count($result) - 1];
     }
 
     /**
@@ -415,7 +415,7 @@ public function getLastRow(string $type = 'object')
     public function getNextRow(string $type = 'object')
     {
         $result = $this->getResult($type);
-        if (empty($result)) {
+        if ($result === []) {
             return null;
         }
 
@@ -430,7 +430,7 @@ public function getNextRow(string $type = 'object')
     public function getPreviousRow(string $type = 'object')
     {
         $result = $this->getResult($type);
-        if (empty($result)) {
+        if ($result === []) {
             return null;
         }
 
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 3a17646ca121..af8f191c276c 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -167,7 +167,7 @@ public function latest(?string $group = null)
 
         $migrations = $this->findMigrations();
 
-        if (empty($migrations)) {
+        if ($migrations === []) {
             return true;
         }
 
@@ -235,7 +235,7 @@ public function regress(int $targetBatch = 0, ?string $group = null)
             $targetBatch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
         }
 
-        if (empty($batches) && $targetBatch === 0) {
+        if ($batches === [] && $targetBatch === 0) {
             return true;
         }
 
diff --git a/system/Database/MySQLi/Builder.php b/system/Database/MySQLi/Builder.php
index 2b95aedcea00..096bbedd888c 100644
--- a/system/Database/MySQLi/Builder.php
+++ b/system/Database/MySQLi/Builder.php
@@ -49,7 +49,7 @@ class Builder extends BaseBuilder
      */
     protected function _fromTables(): string
     {
-        if (! empty($this->QBJoin) && count($this->QBFrom) > 1) {
+        if ($this->QBJoin !== [] && count($this->QBFrom) > 1) {
             return '(' . implode(', ', $this->QBFrom) . ')';
         }
 
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 5e3e4a73bb11..b4e77f1d2cf8 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -332,7 +332,7 @@ public function replace(?array $set = null)
             $this->set($set);
         }
 
-        if (empty($this->QBSet)) {
+        if ($this->QBSet === []) {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('You must use the "set" method to update an entry.');
             }
@@ -514,7 +514,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
             $this->where($where);
         }
 
-        if (empty($this->QBWhere)) {
+        if ($this->QBWhere === []) {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
             }
@@ -551,7 +551,7 @@ protected function compileSelect($selectOverride = false): string
             $sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
 
             // SQL Server can't work with select * if group by is specified
-            if (empty($this->QBSelect) && ! empty($this->QBGroupBy) && is_array($this->QBGroupBy)) {
+            if (empty($this->QBSelect) && $this->QBGroupBy !== [] && is_array($this->QBGroupBy)) {
                 foreach ($this->QBGroupBy as $field) {
                     $this->QBSelect[] = is_array($field) ? $field['field'] : $field;
                 }
@@ -573,7 +573,7 @@ protected function compileSelect($selectOverride = false): string
         }
 
         // Write the "FROM" portion of the query
-        if (! empty($this->QBFrom)) {
+        if ($this->QBFrom !== []) {
             $sql .= "\nFROM " . $this->_fromTables();
         }
 
@@ -660,7 +660,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
                 });
 
                 // if no primary found then look for unique - since indexes have no order
-                if (empty($uniqueIndexes)) {
+                if ($uniqueIndexes === []) {
                     $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
                         $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
 
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index e44624761850..ff1ce2e59bb9 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -145,7 +145,7 @@ protected function _alterTable(string $alterType, string $table, $field)
                 $fld = array_intersect($field, $index->fields);
 
                 // Drop index if field is part of an index
-                if (! empty($fld)) {
+                if ($fld !== []) {
                     $this->_dropIndex($table, $index);
                 }
             }
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 879437da6f6a..b733e980b30e 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -113,7 +113,7 @@ public function fromTable(string $table)
         // if primary key index exists twice then remove psuedo index name 'primary'.
         $primaryIndexes = array_filter($this->keys, static fn ($index) => $index['type'] === 'primary');
 
-        if (! empty($primaryIndexes) && count($primaryIndexes) > 1 && array_key_exists('primary', $this->keys)) {
+        if ($primaryIndexes !== [] && count($primaryIndexes) > 1 && array_key_exists('primary', $this->keys)) {
             unset($this->keys['primary']);
         }
 
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index 2163bb0b2587..4bfb3a5bc88c 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -93,7 +93,7 @@ public function run(int $iterations = 1000, bool $output = true)
      */
     public function getReport(): string
     {
-        if (empty($this->results)) {
+        if ($this->results === []) {
             return 'No results to display.';
         }
 
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 4a7a20632fd7..ceb8b5bc8035 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -121,7 +121,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
             $data['vars']['varData'][esc($heading)] = $varData;
         }
 
-        if (! empty($_SESSION)) {
+        if ($_SESSION !== []) {
             foreach ($_SESSION as $key => $value) {
                 // Replace the binary data with string to avoid json_encode failure.
                 if (is_string($value) && preg_match('~[^\x20-\x7E\t\r\n]~', $value)) {
@@ -292,7 +292,7 @@ protected function structureTimelineData(array $elements): array
         $element = array_shift($elements);
 
         // If we have children behind us, collect and attach them to us
-        while (! empty($elements) && $elements[array_key_first($elements)]['end'] <= $element['end']) {
+        while ($elements !== [] && $elements[array_key_first($elements)]['end'] <= $element['end']) {
             $element['children'][] = array_shift($elements);
         }
 
@@ -302,7 +302,7 @@ protected function structureTimelineData(array $elements): array
         }
 
         // If we have no younger siblings, we can return
-        if (empty($elements)) {
+        if ($elements === []) {
             return [$element];
         }
 
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index b527f2ed3c95..5b5614ad3b9c 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -235,7 +235,7 @@ public function getTitleDetails(): string
      */
     public function isEmpty(): bool
     {
-        return empty(static::$queries);
+        return static::$queries === [];
     }
 
     /**
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index a639e35a4ebd..fcf06e16f54a 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -128,7 +128,7 @@ public function getBadgeValue(): int
      */
     public function isEmpty(): bool
     {
-        return empty($this->files);
+        return $this->files === [];
     }
 
     /**
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 90d3ab46a297..0e751b684843 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -319,7 +319,7 @@ public function setAttributes(array $data)
      */
     protected function mapProperty(string $key)
     {
-        if (empty($this->datamap)) {
+        if ($this->datamap === []) {
             return $key;
         }
 
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 878e8a1d66c6..1d15619c8016 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -147,7 +147,7 @@ public function getOption(string $key)
      */
     public function getOptionString(bool $useLongOpts = false): string
     {
-        if (empty($this->options)) {
+        if ($this->options === []) {
             return '';
         }
 
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 37b0ce650ff7..660d26b6ab88 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -806,11 +806,11 @@ protected function addToHeader(string $name, $values = null)
             }
         }
 
-        if (! empty($sources)) {
+        if ($sources !== []) {
             $this->tempHeaders[$name] = implode(' ', $sources);
         }
 
-        if (! empty($reportSources)) {
+        if ($reportSources !== []) {
             $this->reportOnlyHeaders[$name] = implode(' ', $reportSources);
         }
     }
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 8cb1f913e8dc..124381ec33bb 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -148,7 +148,7 @@ protected function populateFiles()
 
         $this->files = [];
 
-        if (empty($_FILES)) {
+        if ($_FILES === []) {
             return;
         }
 
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index b1d5fdfa93a3..a9297669146a 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -154,7 +154,7 @@ protected function getBestMatch(
         bool $strictMatch = false,
         bool $matchLocales = false
     ): string {
-        if (empty($supported)) {
+        if ($supported === []) {
             throw HTTPException::forEmptySupportedNegotiations();
         }
 
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 7c0741317bc0..90637fdbd7cf 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -377,7 +377,7 @@ public function noCache()
      */
     public function setCache(array $options = [])
     {
-        if (empty($options)) {
+        if ($options === []) {
             return $this;
         }
 
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index 65645c3cc316..b8bd1a4d956f 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -85,7 +85,7 @@ function _array_search_dot(array $indexes, array $array)
 
         // If this is the last index, make sure to return it now,
         // and not try to recurse through things.
-        if (empty($indexes)) {
+        if ($indexes === []) {
             return $array[$currentIndex];
         }
 
@@ -152,7 +152,7 @@ function array_deep_search($key, array $array)
     function array_sort_by_multiple_keys(array &$array, array $sortColumns): bool
     {
         // Check if there really are columns to sort after
-        if (empty($sortColumns) || empty($array)) {
+        if ($sortColumns === [] || $array === []) {
             return false;
         }
 
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 7edb05cf1de3..d3abd7e247b0 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -288,7 +288,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
         }
 
         // If no selected state was submitted we will attempt to set it automatically
-        if (empty($selected)) {
+        if ($selected === []) {
             if (is_array($data)) {
                 if (isset($data['name'], $_POST[$data['name']])) {
                     $selected = [$_POST[$data['name']]];
@@ -312,7 +312,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
             $key = (string) $key;
 
             if (is_array($val)) {
-                if (empty($val)) {
+                if ($val === []) {
                     continue;
                 }
 
@@ -784,7 +784,7 @@ function parse_form_attributes($attributes, array $default): string
                     unset($attributes[$key]);
                 }
             }
-            if (! empty($attributes)) {
+            if ($attributes !== []) {
                 $default = array_merge($default, $attributes);
             }
         }
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index c7a36e270860..88fb339832d1 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -469,7 +469,7 @@ function object(string $data, string $type = 'unknown', string $attributes = '',
         $object = '<object data="' . $data . '" '
                 . $attributes . '>';
 
-        if (! empty($params)) {
+        if ($params !== []) {
             $object .= "\n";
         }
 
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 56cf856fbda7..9c8f7be07ec2 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -98,7 +98,7 @@ function ascii_to_entities(string $str): string
 
                 $out .= $str[$i];
             } else {
-                if (empty($temp)) {
+                if ($temp === []) {
                     $count = ($ordinal < 224) ? 2 : 3;
                 }
 
@@ -172,7 +172,7 @@ function entities_to_ascii(string $str, bool $all = true): string
      */
     function word_censor(string $str, array $censored, string $replacement = ''): string
     {
-        if (empty($censored)) {
+        if ($censored === []) {
             return $str;
         }
 
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 27e3ce1d079f..8099558aa343 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -290,7 +290,7 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
             if ($ordinal < 128) {
                 $x[] = '|' . $ordinal;
             } else {
-                if (empty($temp)) {
+                if ($temp === []) {
                     $count = ($ordinal < 224) ? 2 : 3;
                 }
 
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index 0964edc4f3bf..e5f482cb63d2 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -137,7 +137,7 @@ public function __construct($config, bool $debug = CI_DEBUG)
 
         $this->dateFormat = $config->dateFormat ?? $this->dateFormat;
 
-        if (! is_array($config->handlers) || empty($config->handlers)) {
+        if (! is_array($config->handlers) || $config->handlers === []) {
             throw LogException::forNoHandlers('LoggerConfig');
         }
 
diff --git a/system/Model.php b/system/Model.php
index 4c55aac937bf..a9fd4b312c4a 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -297,7 +297,7 @@ protected function doInsert(array $row)
             $builder->set($key, $val, $escape[$key] ?? null);
         }
 
-        if ($this->allowEmptyInserts && empty($row)) {
+        if ($this->allowEmptyInserts && $row === []) {
             $table = $this->db->protectIdentifiers($this->table, true, null, false);
             if ($this->db->getPlatform() === 'MySQLi') {
                 $sql = 'INSERT INTO ' . $table . ' VALUES ()';
@@ -760,7 +760,7 @@ protected function doProtectFieldsForInsert(array $row): array
             return $row;
         }
 
-        if (empty($this->allowedFields)) {
+        if ($this->allowedFields === []) {
             throw DataException::forInvalidAllowedFields(static::class);
         }
 
diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index f7cd02a3d329..16ec68c87507 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -90,7 +90,7 @@ public function getRoute(string $uri, string $httpVerb): array
 
         // If we don't have any segments left - use the default controller;
         // If not empty, then the first segment should be the controller
-        if (! empty($segments)) {
+        if ($segments !== []) {
             $this->controller = ucfirst(array_shift($segments));
         }
 
@@ -103,7 +103,7 @@ public function getRoute(string $uri, string $httpVerb): array
         // Use the method name if it exists.
         // If it doesn't, no biggie - the default method name
         // has already been set.
-        if (! empty($segments)) {
+        if ($segments !== []) {
             $this->method = array_shift($segments) ?: $this->method;
         }
 
@@ -115,7 +115,7 @@ public function getRoute(string $uri, string $httpVerb): array
         /** @var array $params An array of params to the controller method. */
         $params = [];
 
-        if (! empty($segments)) {
+        if ($segments !== []) {
             $params = $segments;
         }
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 0013d7cdf920..a4af03643e01 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -623,7 +623,7 @@ private function isValidSegment(string $segment): bool
     protected function setRequest(array $segments = [])
     {
         // If we don't have any segments - use the default controller;
-        if (empty($segments)) {
+        if ($segments === []) {
             return;
         }
 
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index abccfafb5ba4..7dc19de05a1a 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -125,7 +125,7 @@ public function open($path, $name): bool
             }
         }
 
-        if (empty($serverList)) {
+        if ($serverList === []) {
             $this->logger->error('Session: Memcached server pool is empty.');
 
             return false;
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 4e4a01581ba2..29516c006417 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -496,7 +496,7 @@ public function get(?string $key = null)
             return $value;
         }
 
-        if (empty($_SESSION)) {
+        if ($_SESSION === []) {
             return $key === null ? [] : null;
         }
 
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 100b14b72dff..a14183eeea92 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -213,7 +213,7 @@ protected function doXPath(?string $search, string $element, array $paths = [])
 
         // $paths might contain a number of different
         // ready to go xpath portions to tack on.
-        if (! empty($paths) && is_array($paths)) {
+        if ($paths !== [] && is_array($paths)) {
             foreach ($paths as $extra) {
                 $path .= $extra;
             }
diff --git a/system/Validation/DotArrayFilter.php b/system/Validation/DotArrayFilter.php
index 43cb19370784..4f696886451d 100644
--- a/system/Validation/DotArrayFilter.php
+++ b/system/Validation/DotArrayFilter.php
@@ -93,7 +93,7 @@ private static function filter(array $indexes, array $array): array
 
         // If this is the last index, make sure to return it now,
         // and not try to recurse through things.
-        if (empty($indexes)) {
+        if ($indexes === []) {
             return [$currentIndex => $array[$currentIndex]];
         }
 
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index eae6d961ce7d..6481a45b4e00 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -256,7 +256,7 @@ public function required($str = null): bool
      */
     public function required_with($str = null, ?string $fields = null, array $data = []): bool
     {
-        if ($fields === null || empty($data)) {
+        if ($fields === null || $data === []) {
             throw new InvalidArgumentException('You must supply the parameters: fields, data.');
         }
 
@@ -283,7 +283,7 @@ public function required_with($str = null, ?string $fields = null, array $data =
             }
         }
 
-        return empty($requiredFields);
+        return $requiredFields === [];
     }
 
     /**
@@ -305,7 +305,7 @@ public function required_without(
         ?string $error = null,
         ?string $field = null
     ): bool {
-        if ($otherFields === null || empty($data)) {
+        if ($otherFields === null || $data === []) {
             throw new InvalidArgumentException('You must supply the parameters: otherFields, data.');
         }
 
diff --git a/system/View/Parser.php b/system/View/Parser.php
index ff729d4837d5..82ace74fba12 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -322,7 +322,7 @@ protected function parsePair(string $variable, array $data, string $template): a
                     if (is_array($val)) {
                         $pair = $this->parsePair($key, $val, $match[1]);
 
-                        if (! empty($pair)) {
+                        if ($pair !== []) {
                             $pairs[array_keys($pair)[0]] = true;
 
                             $temp = array_merge($temp, $pair);
@@ -536,7 +536,7 @@ protected function prepareReplacement(array $matches, string $replace, bool $esc
         // so we need to break them apart so we can apply them all.
         $filters = ! empty($matches[1]) ? explode('|', $matches[1]) : [];
 
-        if ($escape && empty($filters) && ($context = $this->shouldAddEscaping($orig))) {
+        if ($escape && $filters === [] && ($context = $this->shouldAddEscaping($orig))) {
             $filters[] = "esc({$context})";
         }
 
@@ -604,7 +604,7 @@ protected function applyFilters(string $replace, array $filters): string
             }
 
             // Get our filter name
-            $filter = ! empty($param) ? trim(strtolower(substr($filter, 0, strpos($filter, '(')))) : trim($filter);
+            $filter = $param !== [] ? trim(strtolower(substr($filter, 0, strpos($filter, '(')))) : trim($filter);
 
             if (! array_key_exists($filter, $this->config->filters)) {
                 continue;
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index 4b20caef8d3f..a842990dbbe1 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -79,7 +79,7 @@ public static function lang(array $params = []): string
     public static function ValidationErrors(array $params = []): string
     {
         $validator = Services::validation();
-        if (empty($params)) {
+        if ($params === []) {
             return $validator->listErrors();
         }
 
diff --git a/system/View/Table.php b/system/View/Table.php
index 5e241f11fefc..9a259c8beafa 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -312,7 +312,7 @@ public function generate($tableData = null)
         }
 
         // Is there anything to display? No? Smite them!
-        if (empty($this->heading) && empty($this->rows)) {
+        if (empty($this->heading) && $this->rows === []) {
             return 'Undefined table data';
         }
 
@@ -358,7 +358,7 @@ public function generate($tableData = null)
         }
 
         // Build the table rows
-        if (! empty($this->rows)) {
+        if ($this->rows !== []) {
             $out .= $this->template['tbody_open'] . $this->newline;
 
             $i = 1;

From eea4574e4405a660163b824720f6160d62154aa3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 17:34:00 +0900
Subject: [PATCH 327/380] chore: update phpstan-baseline

vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php
---
 phpstan-baseline.php | 106 ++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 78 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 1493398334c1..7acea4e7e82e 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -18,7 +18,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 13,
+	'count' => 10,
 	'path' => __DIR__ . '/system/Autoloader/FileLocator.php',
 ];
 $ignoreErrors[] = [
@@ -33,7 +33,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 16,
+	'count' => 10,
 	'path' => __DIR__ . '/system/BaseModel.php',
 ];
 $ignoreErrors[] = [
@@ -63,7 +63,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 2,
 	'path' => __DIR__ . '/system/CLI/BaseCommand.php',
 ];
 $ignoreErrors[] = [
@@ -83,7 +83,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 1,
 	'path' => __DIR__ . '/system/CLI/CLI.php',
 ];
 $ignoreErrors[] = [
@@ -856,11 +856,6 @@
 	'count' => 4,
 	'path' => __DIR__ . '/system/Config/Services.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Controller.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#',
 	'count' => 1,
@@ -1033,7 +1028,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 10,
+	'count' => 2,
 	'path' => __DIR__ . '/system/Database/BaseResult.php',
 ];
 $ignoreErrors[] = [
@@ -1148,7 +1143,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
+	'count' => 6,
 	'path' => __DIR__ . '/system/Database/MigrationRunner.php',
 ];
 $ignoreErrors[] = [
@@ -1206,11 +1201,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/ModelFactory.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/MySQLi/Builder.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 12,
@@ -1543,7 +1533,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 15,
+	'count' => 10,
 	'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php',
 ];
 $ignoreErrors[] = [
@@ -1593,7 +1583,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 5,
 	'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php',
 ];
 $ignoreErrors[] = [
@@ -1713,7 +1703,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
+	'count' => 2,
 	'path' => __DIR__ . '/system/Database/SQLite3/Table.php',
 ];
 $ignoreErrors[] = [
@@ -1761,11 +1751,6 @@
 	'count' => 3,
 	'path' => __DIR__ . '/system/Debug/Exceptions.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/Iterator.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 5,
@@ -1773,24 +1758,14 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 2,
 	'path' => __DIR__ . '/system/Debug/Toolbar.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/History.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,
@@ -1888,7 +1863,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
+	'count' => 3,
 	'path' => __DIR__ . '/system/Entity/Entity.php',
 ];
 $ignoreErrors[] = [
@@ -1958,7 +1933,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/HTTP/CLIRequest.php',
 ];
 $ignoreErrors[] = [
@@ -1978,7 +1953,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 9,
+	'count' => 7,
 	'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php',
 ];
 $ignoreErrors[] = [
@@ -2031,11 +2006,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#',
 	'count' => 2,
@@ -2133,7 +2103,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
+	'count' => 2,
 	'path' => __DIR__ . '/system/HTTP/Negotiate.php',
 ];
 $ignoreErrors[] = [
@@ -2188,7 +2158,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 5,
 	'path' => __DIR__ . '/system/HTTP/Response.php',
 ];
 $ignoreErrors[] = [
@@ -2266,11 +2236,6 @@
 	'count' => 4,
 	'path' => __DIR__ . '/system/HTTP/UserAgent.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/Helpers/array_helper.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -2358,7 +2323,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Helpers/form_helper.php',
 ];
 $ignoreErrors[] = [
@@ -2378,7 +2343,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 5,
 	'path' => __DIR__ . '/system/Helpers/html_helper.php',
 ];
 $ignoreErrors[] = [
@@ -2398,7 +2363,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Helpers/text_helper.php',
 ];
 $ignoreErrors[] = [
@@ -2408,7 +2373,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Helpers/url_helper.php',
 ];
 $ignoreErrors[] = [
@@ -2551,11 +2516,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Log/Logger.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$level \\(string\\) of method CodeIgniter\\\\Log\\\\Logger\\:\\:log\\(\\) should be contravariant with parameter \\$level \\(mixed\\) of method Psr\\\\Log\\\\LoggerInterface\\:\\:log\\(\\)$#',
 	'count' => 1,
@@ -2563,7 +2523,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 18,
+	'count' => 16,
 	'path' => __DIR__ . '/system/Model.php',
 ];
 $ignoreErrors[] = [
@@ -2648,7 +2608,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 3,
 	'path' => __DIR__ . '/system/Router/AutoRouter.php',
 ];
 $ignoreErrors[] = [
@@ -2838,7 +2798,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 4,
 	'path' => __DIR__ . '/system/Router/Router.php',
 ];
 $ignoreErrors[] = [
@@ -2963,7 +2923,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
+	'count' => 2,
 	'path' => __DIR__ . '/system/Session/Handlers/MemcachedHandler.php',
 ];
 $ignoreErrors[] = [
@@ -2988,7 +2948,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 13,
+	'count' => 12,
 	'path' => __DIR__ . '/system/Session/Session.php',
 ];
 $ignoreErrors[] = [
@@ -3273,7 +3233,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 7,
+	'count' => 6,
 	'path' => __DIR__ . '/system/Test/DOMParser.php',
 ];
 $ignoreErrors[] = [
@@ -3851,11 +3811,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Validation/CreditCardRules.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Validation/DotArrayFilter.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a negated boolean, array\\|null given\\.$#',
 	'count' => 6,
@@ -3868,7 +3823,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 11,
+	'count' => 8,
 	'path' => __DIR__ . '/system/Validation/Rules.php',
 ];
 $ignoreErrors[] = [
@@ -3908,7 +3863,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 9,
+	'count' => 6,
 	'path' => __DIR__ . '/system/View/Parser.php',
 ];
 $ignoreErrors[] = [
@@ -3918,12 +3873,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/View/Plugins.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 9,
+	'count' => 7,
 	'path' => __DIR__ . '/system/View/Table.php',
 ];
 $ignoreErrors[] = [

From 392beacfa8d0a6ad15b5a6649d9cc6e72ac1ad4d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Dec 2023 17:47:48 +0900
Subject: [PATCH 328/380] fix: $_SESSION may be undefined

---
 system/Debug/Toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index ceb8b5bc8035..b99d839265b7 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -121,7 +121,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
             $data['vars']['varData'][esc($heading)] = $varData;
         }
 
-        if ($_SESSION !== []) {
+        if (isset($_SESSION)) {
             foreach ($_SESSION as $key => $value) {
                 // Replace the binary data with string to avoid json_encode failure.
                 if (is_string($value) && preg_match('~[^\x20-\x7E\t\r\n]~', $value)) {

From e6d3fef00425aabda53ac30ce6e36880a06c2b30 Mon Sep 17 00:00:00 2001
From: Donatas Glodenis <dgvirtual@akl.lt>
Date: Sun, 17 Dec 2023 12:00:46 +0200
Subject: [PATCH 329/380] Add explanation on changing default error messages

---
 user_guide_src/source/libraries/validation.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 41b9fa34f93d..6db2806f3e49 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -554,7 +554,9 @@ The Validation library provides several methods to help you set error messages,
 custom error messages, and retrieve one or more errors to display.
 
 By default, error messages are derived from language strings in **system/Language/en/Validation.php**, where
-each rule has an entry.
+each rule has an entry. In case you want to change a message default, create a file
+**app/Language/en/Validation.php** (and/or corresponding folder of locale you use in place of/besides ``en``)
+and place in it keys and values of those error messages for which you want different defaults.
 
 .. _validation-custom-errors:
 

From bfe27c0fee3148f71b4edac6dadc0ac15fd8dc3f Mon Sep 17 00:00:00 2001
From: Donatas Glodenis <dgvirtual@akl.lt>
Date: Sun, 17 Dec 2023 12:04:19 +0200
Subject: [PATCH 330/380] Add explanation where to place custom rules error
 messages

---
 user_guide_src/source/libraries/validation.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 41b9fa34f93d..007c45cfb622 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -760,9 +760,12 @@ a boolean true or false value signifying true if it passed the test or false if
 
 .. literalinclude:: validation/034.php
 
-By default, the system will look within **system/Language/en/Validation.php** for the language strings used
-within errors. In custom rules, you may provide error messages by accepting a ``&$error`` variable by reference in the
-second parameter:
+By default, the system will look within **system/Language/en/Validation.php** for the language strings used within
+errors. To provide default error messages for your custom rules, you may place them in **app/Language/en/Validation.php**
+(and/or corresponding folder of locale you use in place of ``en``). Also, in case you want to use some other language
+string file in place of the default **Validation.php**, you may provide error messages by accepting an ``&$error``
+variable by reference in the second (or, in case your rule needs to work with parameters, as cescribed below – the
+fourth) parameter:
 
 .. literalinclude:: validation/035.php
 

From a28caae05b4f37be270670b5fec455a7df953854 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Dec 2023 13:12:00 +0900
Subject: [PATCH 331/380] test: add test cases for filter `default`

---
 tests/system/View/ParserFilterTest.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 694f3252e539..d654bdd5e011 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -109,15 +109,20 @@ public function testDefault(): void
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'value1' => null,
-            'value2' => 0,
-            'value3' => 'test',
+            'value1' => '',
+            'value2' => null,
+            'value3' => 0,
+            'value4' => 'test',
         ];
 
-        $template = '{ value1|default(foo) } { value2|default(bar) } { value3|default(baz) }';
+        $template = '{ value1|default(foo) } { value2|default(bar) } { value3|default(baz) }'
+                    . ' { value4|default(boo) } { undef|default(far) }';
 
         $parser->setData($data);
-        $this->assertSame('foo bar test', $parser->renderString($template));
+        $this->assertSame(
+            'foo bar baz test { undef|default(far) }',
+            $parser->renderString($template)
+        );
     }
 
     public function testEsc(): void

From 5d9dc9bf21d254985e5a7954b64411356c740558 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Dec 2023 13:14:17 +0900
Subject: [PATCH 332/380] docs: fix incorrect description

Undefined values can not be used in Parser.
---
 user_guide_src/source/outgoing/view_parser.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 1c09d8c36486..6b82129c64c9 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -371,8 +371,7 @@ date              format (Y-m-d)   A PHP **date**-compatible formatting string.
 date_modify       value to add     A **strtotime** compatible string to modify the date,       { v|date_modify(+1 day) }
                   / subtract       like ``+5 day`` or ``-1 week``.
 
-default           default value    Displays the default value if the variable is empty or      { v|default(just in case) }
-                                   undefined.
+default           default value    Displays the default value if the variable is `empty()`_.   { v|default(just in case) }
 
 esc               html, attr,      Specifies the context to escape the data.                   { v|esc(attr) }
                   css, js
@@ -419,6 +418,8 @@ title                              Displays a "title case" version of the string
 upper                              Displays the string in all uppercase.                       { v|upper }
 ================ ================= =========================================================== ======================================
 
+.. _empty(): https://www.php.net/manual/en/function.empty.php
+
 See `PHP's NumberFormatter <https://www.php.net/manual/en/numberformatter.create.php>`_ for details relevant to the
 "local_number" filter.
 

From 05e19c80a6f076994f36eff5a7e9aee55e2d2956 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Dec 2023 14:16:45 +0900
Subject: [PATCH 333/380] docs: add codeigniter4/queue repository

---
 user_guide_src/source/installation/repositories.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst
index 920efc27800f..ed950ddd3802 100644
--- a/user_guide_src/source/installation/repositories.rst
+++ b/user_guide_src/source/installation/repositories.rst
@@ -32,6 +32,8 @@ There are several development repositories, of interest to potential contributor
 +------------------+--------------+-----------------------------------------------------------------+
 | cache_           | developers   | PSR-6 and PSR-16 Cache Adapters for CodeIgniter 4               |
 +------------------+--------------+-----------------------------------------------------------------+
+| queue_           | developers   | Job Queue for CodeIgniter 4                                     |
++------------------+--------------+-----------------------------------------------------------------+
 
 .. _CodeIgniter4: https://github.com/codeigniter4/CodeIgniter4
 .. _translations: https://github.com/codeigniter4/translations
@@ -41,6 +43,7 @@ There are several development repositories, of interest to potential contributor
 .. _shield: https://codeigniter4.github.io/shield
 .. _tasks: https://github.com/codeigniter4/tasks
 .. _cache: https://github.com/codeigniter4/cache
+.. _queue: https://github.com/codeigniter4/queue
 
 There are also several deployment repositories, referenced in the installation directions.
 The deployment repositories are built automatically when a new version is released, and they

From 12a8c6e7ee1c2f357aa4e4ab9f28cf264da7ca1d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Dec 2023 15:33:43 +0900
Subject: [PATCH 334/380] docs: add "Error Handling" in "Upgrading from 3.x to
 4.x"

---
 .../source/installation/upgrade_4xx.rst         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 9e8ac1dbe7aa..7eb86b5dcd32 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -165,6 +165,23 @@ Hooks
 - The hook point ``post_system`` has moved just before sending the final rendered
   page.
 
+Error Handling
+==============
+
+- The behavior in CI4 has been slightly changed.
+
+  - In CI3, ignored errors by ``error_reporting()`` in **index.php** are not logged,
+    but other errors are logged (but depending on the ``log_threshold`` setting,
+    they may not be written to the log file). Only errors with the error level
+    ``E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR``
+    will stop the framework processing, regardless of the error level set in
+    ``error_reporting()``.
+  - In CI4, only errors with the error level set by ``error_reporting()`` in
+    **app/Config/Boot/{environment}.php** are logged (but depending on the
+    ``Config\Logger::$threshold`` setting, they may not be written to the log file).
+    All errors that are not ignored by ``error_reporting()`` will stop the
+    framework processing.
+
 Extending the Framework
 =======================
 

From d32693ead7c26a433217ffb91a5b0c712aa83ae5 Mon Sep 17 00:00:00 2001
From: Donatas Glodenis <dg@lapas.info>
Date: Wed, 20 Dec 2023 10:13:54 +0200
Subject: [PATCH 335/380] Update user_guide_src/source/libraries/validation.rst

Correct typo, sure.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/libraries/validation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 007c45cfb622..6d0ec377f650 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -764,7 +764,7 @@ By default, the system will look within **system/Language/en/Validation.php** fo
 errors. To provide default error messages for your custom rules, you may place them in **app/Language/en/Validation.php**
 (and/or corresponding folder of locale you use in place of ``en``). Also, in case you want to use some other language
 string file in place of the default **Validation.php**, you may provide error messages by accepting an ``&$error``
-variable by reference in the second (or, in case your rule needs to work with parameters, as cescribed below – the
+variable by reference in the second (or, in case your rule needs to work with parameters, as described below – the
 fourth) parameter:
 
 .. literalinclude:: validation/035.php

From 673c50e02cd5ad54b3e4a86a6d0459a8775ac424 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Dec 2023 09:38:48 +0900
Subject: [PATCH 336/380] Revert "chore(deps): bump actions/upload-artifact
 from 3 to 4"

---
 .github/workflows/deploy-userguide-latest.yml           | 2 +-
 .github/workflows/reusable-phpunit-test.yml             | 2 +-
 .github/workflows/reusable-serviceless-phpunit-test.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml
index 8c1545286fe9..ab366268e5ee 100644
--- a/.github/workflows/deploy-userguide-latest.yml
+++ b/.github/workflows/deploy-userguide-latest.yml
@@ -48,7 +48,7 @@ jobs:
 
       # Create an artifact of the html output
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: HTML Documentation
           path: user_guide_src/build/html/
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
index 300f510a0d7f..0963f5865242 100644
--- a/.github/workflows/reusable-phpunit-test.yml
+++ b/.github/workflows/reusable-phpunit-test.yml
@@ -206,7 +206,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
index d7d8f4ca8c46..6371847c77bd 100644
--- a/.github/workflows/reusable-serviceless-phpunit-test.yml
+++ b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -116,7 +116,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

From f2b7ff02d3d683a7ac9217a6a3261ecb3e18fbea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 08:54:06 +0900
Subject: [PATCH 337/380] chore: add
 TernaryEmptyArrayArrayDimFetchToCoalesceRector

---
 rector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rector.php b/rector.php
index 65f5b8fcbec9..9dec5a0a18e9 100644
--- a/rector.php
+++ b/rector.php
@@ -23,6 +23,7 @@
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
+use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
@@ -139,6 +140,7 @@
     $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
     $rectorConfig->rule(SimplifyEmptyCheckOnEmptyArrayRector::class);
+    $rectorConfig->rule(TernaryEmptyArrayArrayDimFetchToCoalesceRector::class);
     $rectorConfig->rule(StringClassNameToClassConstantRector::class);
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);

From 145415e81a3f78d1b60cf1b643b81514f35ad357 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 08:57:56 +0900
Subject: [PATCH 338/380] chore: add EmptyOnNullableObjectToInstanceOfRector

---
 rector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rector.php b/rector.php
index 9dec5a0a18e9..989d42680249 100644
--- a/rector.php
+++ b/rector.php
@@ -45,6 +45,7 @@
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
@@ -141,6 +142,7 @@
     $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
     $rectorConfig->rule(SimplifyEmptyCheckOnEmptyArrayRector::class);
     $rectorConfig->rule(TernaryEmptyArrayArrayDimFetchToCoalesceRector::class);
+    $rectorConfig->rule(EmptyOnNullableObjectToInstanceOfRector::class);
     $rectorConfig->rule(StringClassNameToClassConstantRector::class);
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);

From 2874fb16642ebcc3172a97b5e808facb015f4897 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 09:02:29 +0900
Subject: [PATCH 339/380] refactor: apply
 EmptyOnNullableObjectToInstanceOfRector

---
 system/HTTP/IncomingRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 48b9f3f61be4..26fcf55aa2a5 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -152,7 +152,7 @@ class IncomingRequest extends Request
      */
     public function __construct($config, ?URI $uri = null, $body = 'php://input', ?UserAgent $userAgent = null)
     {
-        if (empty($uri) || empty($userAgent)) {
+        if (! $uri instanceof URI || ! $userAgent instanceof UserAgent) {
             throw new InvalidArgumentException('You must supply the parameters: uri, userAgent.');
         }
 

From 9c93833f99cf997fe25dceab55f26c902c2d7ba8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 09:02:59 +0900
Subject: [PATCH 340/380] chore: add DisallowedEmptyRuleFixerRector

---
 rector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rector.php b/rector.php
index 989d42680249..6d69a0fba2fd 100644
--- a/rector.php
+++ b/rector.php
@@ -44,6 +44,7 @@
 use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
 use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
 use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
@@ -143,6 +144,7 @@
     $rectorConfig->rule(SimplifyEmptyCheckOnEmptyArrayRector::class);
     $rectorConfig->rule(TernaryEmptyArrayArrayDimFetchToCoalesceRector::class);
     $rectorConfig->rule(EmptyOnNullableObjectToInstanceOfRector::class);
+    $rectorConfig->rule(DisallowedEmptyRuleFixerRector::class);
     $rectorConfig->rule(StringClassNameToClassConstantRector::class);
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);

From d2586599479ce508327425d4ffe6da1621bb7215 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 09:08:50 +0900
Subject: [PATCH 341/380] refactor: apply DisallowedEmptyRuleFixerRector

---
 system/API/ResponseTrait.php                  |  2 +-
 system/Autoloader/FileLocator.php             | 12 ++++-----
 system/BaseModel.php                          |  4 +--
 system/CLI/CLI.php                            |  2 +-
 system/Cache/CacheFactory.php                 |  4 +--
 system/Common.php                             |  8 +++---
 system/Database/BaseBuilder.php               | 26 +++++++++----------
 system/Database/Database.php                  |  2 +-
 system/Database/MigrationRunner.php           |  2 +-
 system/Database/MySQLi/Connection.php         |  2 +-
 system/Database/OCI8/Builder.php              |  2 +-
 system/Database/Postgre/Builder.php           |  2 +-
 system/Database/SQLSRV/Builder.php            |  2 +-
 system/Database/SQLSRV/Connection.php         |  4 +--
 system/Database/Seeder.php                    |  2 +-
 system/Debug/BaseExceptionHandler.php         |  2 +-
 system/Debug/Exceptions.php                   |  2 +-
 system/Email/Email.php                        |  4 +--
 system/HTTP/CLIRequest.php                    |  2 +-
 system/HTTP/ContentSecurityPolicy.php         |  2 +-
 system/HTTP/IncomingRequest.php               |  2 +-
 system/HTTP/Negotiate.php                     |  4 +--
 system/HTTP/ResponseTrait.php                 |  6 ++---
 system/HTTP/URI.php                           | 10 +++----
 system/HTTP/UserAgent.php                     |  2 +-
 system/Helpers/date_helper.php                |  2 +-
 system/Helpers/html_helper.php                | 10 +++----
 system/Helpers/number_helper.php              |  4 +--
 system/Honeypot/Honeypot.php                  |  2 +-
 system/I18n/TimeTrait.php                     |  6 ++---
 system/Images/Handlers/GDHandler.php          |  2 +-
 system/Images/Handlers/ImageMagickHandler.php |  2 +-
 system/Model.php                              |  2 +-
 system/Pager/Pager.php                        |  4 +--
 system/Router/AutoRouter.php                  |  6 ++---
 system/Router/RouteCollection.php             |  4 +--
 system/Router/Router.php                      |  2 +-
 system/Session/Handlers/MemcachedHandler.php  |  2 +-
 system/Session/Handlers/RedisHandler.php      |  2 +-
 system/Session/Session.php                    |  6 ++---
 system/Test/FeatureTestCase.php               |  8 +++---
 system/Test/FeatureTestTrait.php              |  2 +-
 system/Validation/FormatRules.php             |  8 +++---
 system/Validation/Validation.php              |  4 +--
 system/View/Parser.php                        |  4 +--
 45 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 5a350007f3fa..e05de280d95f 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -94,7 +94,7 @@ protected function respond($data = null, ?int $status = null, string $message =
             $output = null;
             $this->format($data);
         } else {
-            $status = empty($status) ? 200 : $status;
+            $status = $status === null || $status === 0 ? 200 : $status;
             $output = $this->format($data);
         }
 
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index e9ce492c54d6..a6376e18d7a7 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -51,7 +51,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         $file = $this->ensureExt($file, $ext);
 
         // Clears the folder name if it is at the beginning of the filename
-        if (! empty($folder) && strpos($file, $folder) === 0) {
+        if ($folder !== null && $folder !== '' && $folder !== '0' && strpos($file, $folder) === 0) {
             $file = substr($file, strlen($folder . '/'));
         }
 
@@ -101,7 +101,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
             // If we have a folder name, then the calling function
             // expects this file to be within that folder, like 'Views',
             // or 'libraries'.
-            if (! empty($folder) && strpos($path . $filename, '/' . $folder . '/') === false) {
+            if ($folder !== null && $folder !== '' && $folder !== '0' && strpos($path . $filename, '/' . $folder . '/') === false) {
                 $path .= trim($folder, '/') . '/';
             }
 
@@ -154,7 +154,7 @@ public function getClassname(string $file): string
             }
         }
 
-        if (empty($className)) {
+        if ($className === '' || $className === '0') {
             return '';
         }
 
@@ -305,7 +305,7 @@ public function findQualifiedNameFromPath(string $path)
      */
     public function listFiles(string $path): array
     {
-        if (empty($path)) {
+        if ($path === '' || $path === '0') {
             return [];
         }
 
@@ -338,7 +338,7 @@ public function listFiles(string $path): array
      */
     public function listNamespaceFiles(string $prefix, string $path): array
     {
-        if (empty($path) || empty($prefix)) {
+        if ($path === '' || $path === '0' || ($prefix === '' || $prefix === '0')) {
             return [];
         }
 
@@ -372,7 +372,7 @@ public function listNamespaceFiles(string $prefix, string $path): array
      */
     protected function legacyLocate(string $file, ?string $folder = null)
     {
-        $path = APPPATH . (empty($folder) ? $file : $folder . '/' . $file);
+        $path = APPPATH . ($folder === null || $folder === '' || $folder === '0' ? $file : $folder . '/' . $file);
         $path = realpath($path) ?: $path;
 
         if (is_file($path)) {
diff --git a/system/BaseModel.php b/system/BaseModel.php
index fcda6b134498..1b669a30d2c2 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1579,7 +1579,7 @@ public function getValidationMessages(): array
      */
     protected function cleanValidationRules(array $rules, ?array $row = null): array
     {
-        if (empty($row)) {
+        if ($row === null || $row === []) {
             return [];
         }
 
@@ -1795,7 +1795,7 @@ protected function transformDataToArray($row, string $type): array
         }
 
         // If it's still empty here, means $row is no change or is empty object
-        if (! $this->allowEmptyInserts && empty($row)) {
+        if (! $this->allowEmptyInserts && ($row === null || $row === [])) {
             throw DataException::forEmptyDataset($type);
         }
 
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 64b576735486..e9c5d2965926 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -849,7 +849,7 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
      */
     public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string
     {
-        if (empty($string)) {
+        if ($string === null || $string === '' || $string === '0') {
             return '';
         }
 
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index 95e07ef813c8..02df55860ccf 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -52,8 +52,8 @@ public static function getHandler(Cache $config, ?string $handler = null, ?strin
             throw CacheException::forNoBackup();
         }
 
-        $handler = ! empty($handler) ? $handler : $config->handler;
-        $backup  = ! empty($backup) ? $backup : $config->backupHandler;
+        $handler = $handler !== null && $handler !== '' && $handler !== '0' ? $handler : $config->handler;
+        $backup  = $backup !== null && $backup !== '' && $backup !== '0' ? $backup : $config->backupHandler;
 
         if (! array_key_exists($handler, $config->validHandlers) || ! array_key_exists($backup, $config->validHandlers)) {
             throw CacheException::forHandlerNotFound();
diff --git a/system/Common.php b/system/Common.php
index 56e1c07b6e3e..34ac66120768 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -291,7 +291,7 @@ function csrf_hash(): string
      */
     function csrf_field(?string $id = null): string
     {
-        return '<input type="hidden"' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<input type="hidden"' . ($id !== null && $id !== '' && $id !== '0' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
@@ -301,7 +301,7 @@ function csrf_field(?string $id = null): string
      */
     function csrf_meta(?string $id = null): string
     {
-        return '<meta' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<meta' . ($id !== null && $id !== '' && $id !== '0' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
@@ -856,7 +856,7 @@ function redirect(?string $route = null): RedirectResponse
     {
         $response = Services::redirectresponse(null, true);
 
-        if (! empty($route)) {
+        if ($route !== null && $route !== '' && $route !== '0') {
             return $response->route($route);
         }
 
@@ -1129,7 +1129,7 @@ function timer(?string $name = null, ?callable $callable = null)
     {
         $timer = Services::timer();
 
-        if (empty($name)) {
+        if ($name === null || $name === '' || $name === '0') {
             return $timer;
         }
 
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 6e3829fa079b..b2a053465e73 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -318,7 +318,7 @@ public function __construct($tableName, ConnectionInterface $db, ?array $options
 
         $this->from($tableName);
 
-        if (! empty($options)) {
+        if ($options !== null && $options !== []) {
             foreach ($options as $key => $value) {
                 if (property_exists($this, $key)) {
                     $this->{$key} = $value;
@@ -928,7 +928,7 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
      */
     protected function _whereIn(?string $key = null, $values = null, bool $not = false, string $type = 'AND ', ?bool $escape = null, string $clause = 'QBWhere')
     {
-        if (empty($key) || ! is_string($key)) {
+        if ($key === null || $key === '' || $key === '0' || ! is_string($key)) {
             throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
         }
 
@@ -1434,7 +1434,7 @@ public function orHaving($key, $value = null, ?bool $escape = null)
     public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
     {
         $qbOrderBy = [];
-        if (empty($orderBy)) {
+        if ($orderBy === '' || $orderBy === '0') {
             return $this;
         }
 
@@ -1490,7 +1490,7 @@ public function limit(?int $value = null, ?int $offset = 0)
             $this->QBLimit = $value;
         }
 
-        if (! empty($offset)) {
+        if ($offset !== null && $offset !== 0) {
             $this->QBOffset = $offset;
         }
 
@@ -1504,7 +1504,7 @@ public function limit(?int $value = null, ?int $offset = 0)
      */
     public function offset(int $offset)
     {
-        if (! empty($offset)) {
+        if ($offset !== 0) {
             $this->QBOffset = (int) $offset;
         }
 
@@ -1736,7 +1736,7 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
             $this->where($where);
         }
 
-        if (! empty($limit)) {
+        if ($limit !== null && $limit !== 0) {
             $this->limit($limit, $offset);
         }
 
@@ -2452,7 +2452,7 @@ public function update($set = null, $where = null, ?int $limit = null): bool
             $this->where($where);
         }
 
-        if (! empty($limit)) {
+        if ($limit !== null && $limit !== 0) {
             if (! $this->canLimitWhereUpdates) {
                 throw new DatabaseException('This driver does not allow LIMITs on UPDATE queries using WHERE.');
             }
@@ -2762,7 +2762,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
 
         $sql = $this->_delete($this->removeAlias($table));
 
-        if (! empty($limit)) {
+        if ($limit !== null && $limit !== 0) {
             $this->QBLimit = $limit;
         }
 
@@ -3172,7 +3172,7 @@ protected function compileGroupBy(): string
      */
     protected function compileOrderBy(): string
     {
-        if (is_array($this->QBOrderBy) && ! empty($this->QBOrderBy)) {
+        if (is_array($this->QBOrderBy) && $this->QBOrderBy !== []) {
             foreach ($this->QBOrderBy as &$orderBy) {
                 if ($orderBy['escape'] !== false && ! $this->isLiteral($orderBy['field'])) {
                     $orderBy['field'] = $this->db->protectIdentifiers($orderBy['field']);
@@ -3265,10 +3265,10 @@ protected function isLiteral(string $str): bool
     {
         $str = trim($str);
 
-        if (empty($str)
-            || ctype_digit($str)
-            || (string) (float) $str === $str
-            || in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
+        if ($str === '' || $str === '0'
+                        || ctype_digit($str)
+                        || (string) (float) $str === $str
+                        || in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
         ) {
             return true;
         }
diff --git a/system/Database/Database.php b/system/Database/Database.php
index 2818fe220928..2a4aa20678a9 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -104,7 +104,7 @@ protected function parseDSN(array $params): array
             'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : '',
         ];
 
-        if (! empty($dsn['query'])) {
+        if (isset($dsn['query']) && ($dsn['query'] !== '' && $dsn['query'] !== '0')) {
             parse_str($dsn['query'], $extra);
 
             foreach ($extra as $key => $val) {
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index af8f191c276c..722538ce2cac 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -639,7 +639,7 @@ public function getHistory(string $group = 'default'): array
         $builder = $this->db->table($this->table);
 
         // If group was specified then use it
-        if (! empty($group)) {
+        if ($group !== '' && $group !== '0') {
             $builder->where('group', $group);
         }
 
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 45b306ce2a44..3139185f1bc4 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -150,7 +150,7 @@ public function connect(bool $persistent = false)
                 $ssl['cipher'] = $this->encrypt['ssl_cipher'];
             }
 
-            if (! empty($ssl)) {
+            if ($ssl !== []) {
                 if (isset($this->encrypt['ssl_verify'])) {
                     if ($this->encrypt['ssl_verify']) {
                         if (defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT')) {
diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index bccb0bc54716..f5527ce745c6 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -166,7 +166,7 @@ protected function _truncate(string $table): string
      */
     public function delete($where = '', ?int $limit = null, bool $resetData = true)
     {
-        if (! empty($limit)) {
+        if ($limit !== null && $limit !== 0) {
             $this->QBLimit = $limit;
         }
 
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index e9763089a90f..3e3ed68a9356 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -229,7 +229,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      */
     public function delete($where = '', ?int $limit = null, bool $resetData = true)
     {
-        if (! empty($limit) || ! empty($this->QBLimit)) {
+        if ($limit !== null && $limit !== 0 || ! empty($this->QBLimit)) {
             throw new DatabaseException('PostgreSQL does not allow LIMITs on DELETE queries.');
         }
 
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index b4e77f1d2cf8..c86e82633091 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -522,7 +522,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
             return false; // @codeCoverageIgnore
         }
 
-        if (! empty($limit)) {
+        if ($limit !== null && $limit !== 0) {
             $this->QBLimit = $limit;
         }
 
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index f1a9fb0b433a..21ca9ad70411 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -444,7 +444,7 @@ public function affectedRows(): int
      */
     public function setDatabase(?string $databaseName = null)
     {
-        if (empty($databaseName)) {
+        if ($databaseName === null || $databaseName === '' || $databaseName === '0') {
             $databaseName = $this->database;
         }
 
@@ -538,7 +538,7 @@ public function getVersion(): string
             return $this->dataCache['version'];
         }
 
-        if (! $this->connID || empty($info = sqlsrv_server_info($this->connID))) {
+        if (! $this->connID || ($info = sqlsrv_server_info($this->connID)) === []) {
             $this->initialize();
         }
 
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 749f6f34d5c7..c02dbfc7d951 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -78,7 +78,7 @@ public function __construct(Database $config, ?BaseConnection $db = null)
     {
         $this->seedPath = $config->filesPath ?? APPPATH . 'Database/';
 
-        if (empty($this->seedPath)) {
+        if ($this->seedPath === '' || $this->seedPath === '0') {
             throw new InvalidArgumentException('Invalid filesPath set in the Config\Database.');
         }
 
diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index d4f045797366..8627ad1e3d1e 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -161,7 +161,7 @@ protected static function describeMemory(int $bytes): string
      */
     protected static function highlightFile(string $file, int $lineNumber, int $lines = 15)
     {
-        if (empty($file) || ! is_readable($file)) {
+        if ($file === '' || $file === '0' || ! is_readable($file)) {
             return false;
         }
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 145474c6c633..86e8834ecc3c 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -522,7 +522,7 @@ public static function describeMemory(int $bytes): string
      */
     public static function highlightFile(string $file, int $lineNumber, int $lines = 15)
     {
-        if (empty($file) || ! is_readable($file)) {
+        if ($file === '' || $file === '0' || ! is_readable($file)) {
             return false;
         }
 
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 6a7510b1d2a9..22f20ae6ce3d 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1236,13 +1236,13 @@ protected function buildMessage()
                     . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
                     . '--' . $altBoundary . '--' . $this->newline . $this->newline;
 
-                if (! empty($relBoundary)) {
+                if ($relBoundary !== '' && $relBoundary !== '0') {
                     $body .= $this->newline . $this->newline;
                     $this->appendAttachments($body, $relBoundary, 'related');
                 }
 
                 // multipart/mixed attachments
-                if (! empty($atcBoundary)) {
+                if ($atcBoundary !== '' && $atcBoundary !== '0') {
                     $body .= $this->newline . $this->newline;
                     $this->appendAttachments($body, $atcBoundary, 'mixed');
                 }
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 1d15619c8016..30be13835a90 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -95,7 +95,7 @@ public function getPath(): string
     {
         $path = implode('/', $this->segments);
 
-        return empty($path) ? '' : $path;
+        return $path === '' || $path === '0' ? '' : $path;
     }
 
     /**
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 660d26b6ab88..951d8fa2960f 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -790,7 +790,7 @@ protected function addToHeader(string $name, $values = null)
         $reportSources = [];
 
         foreach ($values as $value => $reportOnly) {
-            if (is_numeric($value) && is_string($reportOnly) && ! empty($reportOnly)) {
+            if (is_numeric($value) && is_string($reportOnly) && ($reportOnly !== '' && $reportOnly !== '0')) {
                 $value      = $reportOnly;
                 $reportOnly = $this->reportOnly;
             }
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 26fcf55aa2a5..82287d66c3d2 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -256,7 +256,7 @@ protected function detectURI(string $protocol, string $baseURL)
      */
     public function detectPath(string $protocol = ''): string
     {
-        if (empty($protocol)) {
+        if ($protocol === '' || $protocol === '0') {
             $protocol = 'REQUEST_URI';
         }
 
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index a9297669146a..21a01e05e023 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -93,7 +93,7 @@ public function charset(array $supported): string
 
         // If no charset is shown as a match, ignore the directive
         // as allowed by the RFC, and tell it a default value.
-        if (empty($match)) {
+        if ($match === '' || $match === '0') {
             return 'utf-8';
         }
 
@@ -158,7 +158,7 @@ protected function getBestMatch(
             throw HTTPException::forEmptySupportedNegotiations();
         }
 
-        if (empty($header)) {
+        if ($header === null || $header === '' || $header === '0') {
             return $strictMatch ? '' : $supported[0];
         }
 
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 90637fdbd7cf..8cdf8516e773 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -156,13 +156,13 @@ public function setStatusCode(int $code, string $reason = '')
         }
 
         // Unknown and no message?
-        if (! array_key_exists($code, static::$statusCodes) && empty($reason)) {
+        if (! array_key_exists($code, static::$statusCodes) && ($reason === '' || $reason === '0')) {
             throw HTTPException::forUnkownStatusCode($code);
         }
 
         $this->statusCode = $code;
 
-        $this->reason = ! empty($reason) ? $reason : static::$statusCodes[$code];
+        $this->reason = $reason !== '' && $reason !== '0' ? $reason : static::$statusCodes[$code];
 
         return $this;
     }
@@ -226,7 +226,7 @@ public function setLink(PagerInterface $pager)
     public function setContentType(string $mime, string $charset = 'UTF-8')
     {
         // add charset attribute if not already there and provided as parm
-        if ((strpos($mime, 'charset=') < 1) && ! empty($charset)) {
+        if ((strpos($mime, 'charset=') < 1) && ($charset !== '' && $charset !== '0')) {
             $mime .= '; charset=' . $charset;
         }
 
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 608f8b75d5ba..e5df4e94c43c 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -163,11 +163,11 @@ public static function createURIString(
         ?string $fragment = null
     ): string {
         $uri = '';
-        if (! empty($scheme)) {
+        if ($scheme !== null && $scheme !== '' && $scheme !== '0') {
             $uri .= $scheme . '://';
         }
 
-        if (! empty($authority)) {
+        if ($authority !== null && $authority !== '' && $authority !== '0') {
             $uri .= $authority;
         }
 
@@ -886,7 +886,7 @@ public function setQuery(string $query)
         }
 
         // Can't have leading ?
-        if (! empty($query) && strpos($query, '?') === 0) {
+        if ($query !== '' && $query !== '0' && strpos($query, '?') === 0) {
             $query = substr($query, 1);
         }
 
@@ -1097,7 +1097,7 @@ public function resolveRelativeURI(string $uri)
         $transformed = clone $relative;
 
         // 5.2.2 Transform References in a non-strict method (no scheme)
-        if (! empty($relative->getAuthority())) {
+        if ($relative->getAuthority() !== '' && $relative->getAuthority() !== '0') {
             $transformed
                 ->setAuthority($relative->getAuthority())
                 ->setPath($relative->getPath())
@@ -1139,7 +1139,7 @@ public function resolveRelativeURI(string $uri)
      */
     protected function mergePaths(self $base, self $reference): string
     {
-        if (! empty($base->getAuthority()) && $base->getPath() === '') {
+        if ($base->getAuthority() !== '' && $base->getAuthority() !== '0' && $base->getPath() === '') {
             return '/' . ltrim($reference->getPath(), '/ ');
         }
 
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 77e7cb4392fc..3ae4d117163b 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -260,7 +260,7 @@ public function parse(string $string)
         // Set the new user-agent string and parse it, unless empty
         $this->agent = $string;
 
-        if (! empty($string)) {
+        if ($string !== '' && $string !== '0') {
             $this->compileData();
         }
     }
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index ba9c9a249455..2e898c424e00 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -24,7 +24,7 @@
      */
     function now(?string $timezone = null): int
     {
-        $timezone = empty($timezone) ? app_timezone() : $timezone;
+        $timezone = $timezone === null || $timezone === '' || $timezone === '0' ? app_timezone() : $timezone;
 
         if ($timezone === 'local' || $timezone === date_default_timezone_get()) {
             return Time::now()->getTimestamp();
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 88fb339832d1..5df62efcc9de 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -313,7 +313,7 @@ function video($src, string $unsupportedMessage = '', string $attributes = '', a
             $video .= _space_indent() . $track . "\n";
         }
 
-        if (! empty($unsupportedMessage)) {
+        if ($unsupportedMessage !== '' && $unsupportedMessage !== '0') {
             $video .= _space_indent()
                     . $unsupportedMessage
                     . "\n";
@@ -359,7 +359,7 @@ function audio($src, string $unsupportedMessage = '', string $attributes = '', a
             $audio .= "\n" . _space_indent() . $track;
         }
 
-        if (! empty($unsupportedMessage)) {
+        if ($unsupportedMessage !== '' && $unsupportedMessage !== '0') {
             $audio .= "\n" . _space_indent() . $unsupportedMessage . "\n";
         }
 
@@ -377,7 +377,7 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
     {
         $media = '<' . $name;
 
-        if (empty($attributes)) {
+        if ($attributes === '' || $attributes === '0') {
             $media .= '>';
         } else {
             $media .= ' ' . $attributes . '>';
@@ -393,7 +393,7 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
             $media .= _space_indent() . $track . "\n";
         }
 
-        if (! empty($unsupportedMessage)) {
+        if ($unsupportedMessage !== '' && $unsupportedMessage !== '0') {
             $media .= _space_indent() . $unsupportedMessage . "\n";
         }
 
@@ -421,7 +421,7 @@ function source(string $src, string $type = 'unknown', string $attributes = '',
         $source = '<source src="' . $src
                 . '" type="' . $type . '"';
 
-        if (! empty($attributes)) {
+        if ($attributes !== '' && $attributes !== '0') {
             $source .= ' ' . $attributes;
         }
 
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 74173501e177..4bb09340656f 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -32,7 +32,7 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
 
         // ignore sub part
         $generalLocale = $locale;
-        if (! empty($locale) && ($underscorePos = strpos($locale, '_'))) {
+        if ($locale !== null && $locale !== '' && $locale !== '0' && ($underscorePos = strpos($locale, '_'))) {
             $generalLocale = substr($locale, 0, $underscorePos);
         }
 
@@ -88,7 +88,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
 
         // ignore sub part
         $generalLocale = $locale;
-        if (! empty($locale) && ($underscorePos = strpos($locale, '_'))) {
+        if ($locale !== null && $locale !== '' && $locale !== '0' && ($underscorePos = strpos($locale, '_'))) {
             $generalLocale = substr($locale, 0, $underscorePos);
         }
 
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index 7871a1925832..65e2db8facdf 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -44,7 +44,7 @@ public function __construct(HoneypotConfig $config)
             throw HoneypotException::forNoHiddenValue();
         }
 
-        if (empty($this->config->container) || strpos($this->config->container, '{template}') === false) {
+        if ($this->config->container === '' || $this->config->container === '0' || strpos($this->config->container, '{template}') === false) {
             $this->config->container = '<div style="display:none">{template}</div>';
         }
 
diff --git a/system/I18n/TimeTrait.php b/system/I18n/TimeTrait.php
index da2bf046517b..9e12e8d9f69e 100644
--- a/system/I18n/TimeTrait.php
+++ b/system/I18n/TimeTrait.php
@@ -217,9 +217,9 @@ public static function create(?int $year = null, ?int $month = null, ?int $day =
         $year ??= date('Y');
         $month ??= date('m');
         $day ??= date('d');
-        $hour    = empty($hour) ? 0 : $hour;
-        $minutes = empty($minutes) ? 0 : $minutes;
-        $seconds = empty($seconds) ? 0 : $seconds;
+        $hour    = $hour === null    || $hour === 0 ? 0 : $hour;
+        $minutes = $minutes === null || $minutes === 0 ? 0 : $minutes;
+        $seconds = $seconds === null || $seconds === 0 ? 0 : $seconds;
 
         return new self(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
     }
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index 6620dcac431a..32540e1afe67 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -208,7 +208,7 @@ protected function process(string $action)
     public function save(?string $target = null, int $quality = 90): bool
     {
         $original = $target;
-        $target   = empty($target) ? $this->image()->getPathname() : $target;
+        $target   = $target === null || $target === '' || $target === '0' ? $this->image()->getPathname() : $target;
 
         // If no new resource has been created, then we're
         // simply copy the existing one.
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 857a273d5372..5f020536caed 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -227,7 +227,7 @@ protected function process(string $action, int $quality = 100): array
     public function save(?string $target = null, int $quality = 90): bool
     {
         $original = $target;
-        $target   = empty($target) ? $this->image()->getPathname() : $target;
+        $target   = $target === null || $target === '' || $target === '0' ? $this->image()->getPathname() : $target;
 
         // If no new resource has been created, then we're
         // simply copy the existing one.
diff --git a/system/Model.php b/system/Model.php
index a9fd4b312c4a..f72213361de9 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -650,7 +650,7 @@ public function builder(?string $table = null)
             throw ModelException::forNoPrimaryKey(static::class);
         }
 
-        $table = empty($table) ? $this->table : $table;
+        $table = $table === null || $table === '' || $table === '0' ? $this->table : $table;
 
         // Ensure we have a good db connection
         if (! $this->db instanceof BaseConnection) {
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index b08cb00410fd..d9de5faab401 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -310,7 +310,7 @@ public function getNextPageURI(string $group = 'default', bool $returnObject = f
         $curr = $this->getCurrentPage($group);
         $page = null;
 
-        if (! empty($last) && ! empty($curr) && $last === $curr) {
+        if (! empty($last) && $curr !== 0 && $last === $curr) {
             return null;
         }
 
@@ -334,7 +334,7 @@ public function getPreviousPageURI(string $group = 'default', bool $returnObject
         $curr  = $this->getCurrentPage($group);
         $page  = null;
 
-        if (! empty($first) && ! empty($curr) && $first === $curr) {
+        if ($first !== 0 && $curr !== 0 && $first === $curr) {
             return null;
         }
 
diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index 16ec68c87507..fd7bc7e154df 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -259,7 +259,7 @@ private function isValidSegment(string $segment): bool
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
-        if (empty($dir)) {
+        if ($dir === null || $dir === '' || $dir === '0') {
             $this->directory = null;
 
             return;
@@ -275,7 +275,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
             }
         }
 
-        if ($append !== true || empty($this->directory)) {
+        if ($append !== true || ($this->directory === null || $this->directory === '' || $this->directory === '0')) {
             $this->directory = trim($dir, '/') . '/';
         } else {
             $this->directory .= trim($dir, '/') . '/';
@@ -290,7 +290,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
      */
     public function directory(): string
     {
-        return ! empty($this->directory) ? $this->directory : '';
+        return $this->directory !== null && $this->directory !== '' && $this->directory !== '0' ? $this->directory : '';
     }
 
     private function controllerName(): string
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 9a51e6f89a98..3edd47c99737 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -564,7 +564,7 @@ public function shouldAutoRoute(): bool
      */
     public function getRoutes(?string $verb = null, bool $includeWildcard = true): array
     {
-        if (empty($verb)) {
+        if ($verb === null || $verb === '' || $verb === '0') {
             $verb = $this->getHTTPVerb();
         }
 
@@ -995,7 +995,7 @@ public function presenter(string $name, ?array $options = null): RouteCollection
      */
     public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): RouteCollectionInterface
     {
-        if (empty($from) || empty($to)) {
+        if ($from === '' || $from === '0' || empty($to)) {
             throw new InvalidArgumentException('You must supply the parameters: from, to.');
         }
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index a4af03643e01..ed3ddf16e858 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -589,7 +589,7 @@ protected function scanControllers(array $segments): array
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
-        if (empty($dir)) {
+        if ($dir === null || $dir === '' || $dir === '0') {
             $this->directory = null;
         }
 
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index 7dc19de05a1a..094962dc8878 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -70,7 +70,7 @@ public function __construct(SessionConfig $config, string $ipAddress)
             $this->keyPrefix .= $this->ipAddress . ':';
         }
 
-        if (! empty($this->keyPrefix)) {
+        if ($this->keyPrefix !== '' && $this->keyPrefix !== '0') {
             ini_set('memcached.sess_prefix', $this->keyPrefix);
         }
     }
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index 1fb87597ab8a..d14e66221a53 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -71,7 +71,7 @@ public function __construct(SessionConfig $config, string $ipAddress)
         parent::__construct($config, $ipAddress);
 
         // Store Session configurations
-        $this->sessionExpiration = empty($config->expiration)
+        $this->sessionExpiration = $config->expiration === 0
             ? (int) ini_get('session.gc_maxlifetime')
             : $config->expiration;
         // Add sessionCookieName for multiple session cookies.
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 29516c006417..b698387de422 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -299,7 +299,7 @@ protected function configure()
             ini_set('session.gc_maxlifetime', (string) $this->config->expiration);
         }
 
-        if (! empty($this->config->savePath)) {
+        if ($this->config->savePath !== '' && $this->config->savePath !== '0') {
             ini_set('session.save_path', $this->config->savePath);
         }
 
@@ -492,7 +492,7 @@ public function set($data, $value = null)
      */
     public function get(?string $key = null)
     {
-        if (! empty($key) && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
+        if ($key !== null && $key !== '' && $key !== '0' && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
             return $value;
         }
 
@@ -500,7 +500,7 @@ public function get(?string $key = null)
             return $key === null ? [] : null;
         }
 
-        if (! empty($key)) {
+        if ($key !== null && $key !== '' && $key !== '0') {
             return null;
         }
 
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index c94cf926ca89..cecc67c4eead 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -186,7 +186,7 @@ public function call(string $method, string $path, ?array $params = null)
             ->run($routes, true);
 
         $output = \ob_get_contents();
-        if (empty($response->getBody()) && ! empty($output)) {
+        if (empty($response->getBody()) && ! ($output === '' || $output === '0' || $output === false)) {
             $response->setBody($output);
         }
 
@@ -335,7 +335,7 @@ protected function populateGlobals(string $method, $request, ?array $params = nu
     {
         // $params should set the query vars if present,
         // otherwise set it from the URL.
-        $get = ! empty($params) && $method === 'get'
+        $get = $params !== null && $params !== [] && $method === 'get'
             ? $params
             : $this->getPrivateProperty($request->getUri(), 'query');
 
@@ -371,7 +371,7 @@ protected function setRequestBody($request, ?array $params = null)
         }
 
         if (isset($this->bodyFormat) && $this->bodyFormat !== '') {
-            if (empty($params)) {
+            if ($params === null || $params === []) {
                 $params = $request->fetchGlobal('request');
             }
             $formatMime = '';
@@ -380,7 +380,7 @@ protected function setRequestBody($request, ?array $params = null)
             } elseif ($this->bodyFormat === 'xml') {
                 $formatMime = 'application/xml';
             }
-            if (! empty($formatMime) && ! empty($params)) {
+            if ($formatMime !== '' && $formatMime !== '0' && ! empty($params)) {
                 $formatted = Services::format()->getFormatter($formatMime)->format($params);
                 $request->setBody($formatted);
                 $request->setHeader('Content-Type', $formatMime);
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 6acef638f6b3..7bcb56242428 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -336,7 +336,7 @@ protected function populateGlobals(string $method, Request $request, ?array $par
     {
         // $params should set the query vars if present,
         // otherwise set it from the URL.
-        $get = (! empty($params) && $method === 'get')
+        $get = ($params !== null && $params !== [] && $method === 'get')
             ? $params
             : $this->getPrivateProperty($request->getUri(), 'query');
 
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 5089f5a0961f..a3618ae528d6 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -252,7 +252,7 @@ public function valid_emails(?string $str = null): bool
      */
     public function valid_ip(?string $ip = null, ?string $which = null): bool
     {
-        if (empty($ip)) {
+        if ($ip === null || $ip === '' || $ip === '0') {
             return false;
         }
 
@@ -281,7 +281,7 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
      */
     public function valid_url(?string $str = null): bool
     {
-        if (empty($str)) {
+        if ($str === null || $str === '' || $str === '0') {
             return false;
         }
 
@@ -305,7 +305,7 @@ public function valid_url(?string $str = null): bool
      */
     public function valid_url_strict(?string $str = null, ?string $validSchemes = null): bool
     {
-        if (empty($str)) {
+        if ($str === null || $str === '' || $str === '0') {
             return false;
         }
 
@@ -329,7 +329,7 @@ public function valid_date(?string $str = null, ?string $format = null): bool
             return false;
         }
 
-        if (empty($format)) {
+        if ($format === null || $format === '' || $format === '0') {
             return strtotime($str) !== false;
         }
 
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index f9bcc61bb511..43c52fb9aaf5 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -730,7 +730,7 @@ protected function loadRuleSets()
      */
     public function loadRuleGroup(?string $group = null)
     {
-        if (empty($group)) {
+        if ($group === null || $group === '' || $group === '0') {
             return [];
         }
 
@@ -912,7 +912,7 @@ protected function getErrorMessage(
             $message = lang('Validation.' . $rule);
         }
 
-        $message = str_replace('{field}', empty($label) ? $field : lang($label), $message);
+        $message = str_replace('{field}', $label === null || $label === '' || $label === '0' ? $field : lang($label), $message);
         $message = str_replace(
             '{param}',
             empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']),
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 82ace74fba12..5c1276656613 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -190,7 +190,7 @@ public function renderString(string $template, ?array $options = null, ?bool $sa
      */
     public function setData(array $data = [], ?string $context = null): RendererInterface
     {
-        if (! empty($context)) {
+        if ($context !== null && $context !== '' && $context !== '0') {
             foreach ($data as $key => &$value) {
                 if (is_array($value)) {
                     foreach ($value as &$obj) {
@@ -592,7 +592,7 @@ protected function applyFilters(string $replace, array $filters): string
             $param = ! empty($param) ? trim($param[0], '() ') : null;
 
             // Params can be separated by commas to allow multiple parameters for the filter
-            if (! empty($param)) {
+            if ($param !== null && $param !== '' && $param !== '0') {
                 $param = explode(',', $param);
 
                 // Clean it up

From 93b79928fa8726d4222633a7bc56bbeb354bf774 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 09:15:56 +0900
Subject: [PATCH 342/380] chore: update phpstan-baseline

vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php
---
 phpstan-baseline.php | 128 ++++++++++++-------------------------------
 1 file changed, 34 insertions(+), 94 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 7acea4e7e82e..b9d7da5cfdca 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -18,7 +18,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 10,
+	'count' => 3,
 	'path' => __DIR__ . '/system/Autoloader/FileLocator.php',
 ];
 $ignoreErrors[] = [
@@ -33,7 +33,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 10,
+	'count' => 8,
 	'path' => __DIR__ . '/system/BaseModel.php',
 ];
 $ignoreErrors[] = [
@@ -81,11 +81,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/CLI/CLI.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/CLI/CLI.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#',
 	'count' => 1,
@@ -136,11 +131,6 @@
 	'count' => 5,
 	'path' => __DIR__ . '/system/CLI/CLI.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Cache/CacheFactory.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in &&, string given on the left side\\.$#',
 	'count' => 1,
@@ -763,7 +753,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
+	'count' => 4,
 	'path' => __DIR__ . '/system/Common.php',
 ];
 $ignoreErrors[] = [
@@ -878,7 +868,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 40,
+	'count' => 30,
 	'path' => __DIR__ . '/system/Database/BaseBuilder.php',
 ];
 $ignoreErrors[] = [
@@ -1068,7 +1058,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
+	'count' => 2,
 	'path' => __DIR__ . '/system/Database/Database.php',
 ];
 $ignoreErrors[] = [
@@ -1143,7 +1133,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 5,
 	'path' => __DIR__ . '/system/Database/MigrationRunner.php',
 ];
 $ignoreErrors[] = [
@@ -1203,7 +1193,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 12,
+	'count' => 11,
 	'path' => __DIR__ . '/system/Database/MySQLi/Connection.php',
 ];
 $ignoreErrors[] = [
@@ -1268,7 +1258,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
+	'count' => 3,
 	'path' => __DIR__ . '/system/Database/OCI8/Builder.php',
 ];
 $ignoreErrors[] = [
@@ -1368,7 +1358,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
+	'count' => 7,
 	'path' => __DIR__ . '/system/Database/Postgre/Builder.php',
 ];
 $ignoreErrors[] = [
@@ -1533,7 +1523,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 10,
+	'count' => 9,
 	'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php',
 ];
 $ignoreErrors[] = [
@@ -1558,7 +1548,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
+	'count' => 6,
 	'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php',
 ];
 $ignoreErrors[] = [
@@ -1721,11 +1711,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/Utils.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Seeder.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Database\\\\Seeder\\:\\:call\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -1738,17 +1723,17 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php',
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Debug/ExceptionHandler.php',
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Debug/Exceptions.php',
 ];
 $ignoreErrors[] = [
@@ -1798,7 +1783,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 14,
+	'count' => 12,
 	'path' => __DIR__ . '/system/Email/Email.php',
 ];
 $ignoreErrors[] = [
@@ -1931,11 +1916,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Filters/Filters.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/HTTP/CLIRequest.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 10,
@@ -1953,7 +1933,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 7,
+	'count' => 6,
 	'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php',
 ];
 $ignoreErrors[] = [
@@ -2068,7 +2048,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 2,
 	'path' => __DIR__ . '/system/HTTP/IncomingRequest.php',
 ];
 $ignoreErrors[] = [
@@ -2101,11 +2081,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/HTTP/Negotiate.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/HTTP/Negotiate.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, int\\|null given\\.$#',
 	'count' => 1,
@@ -2158,7 +2133,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 2,
 	'path' => __DIR__ . '/system/HTTP/Response.php',
 ];
 $ignoreErrors[] = [
@@ -2193,7 +2168,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 15,
+	'count' => 10,
 	'path' => __DIR__ . '/system/HTTP/URI.php',
 ];
 $ignoreErrors[] = [
@@ -2228,7 +2203,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
+	'count' => 2,
 	'path' => __DIR__ . '/system/HTTP/UserAgent.php',
 ];
 $ignoreErrors[] = [
@@ -2236,11 +2211,6 @@
 	'count' => 4,
 	'path' => __DIR__ . '/system/HTTP/UserAgent.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Helpers/date_helper.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 1024\\> given\\.$#',
 	'count' => 2,
@@ -2341,21 +2311,11 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Helpers/form_helper.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
-	'path' => __DIR__ . '/system/Helpers/html_helper.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/Helpers/html_helper.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Helpers/number_helper.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,
@@ -2393,7 +2353,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Honeypot/Honeypot.php',
 ];
 $ignoreErrors[] = [
@@ -2401,11 +2361,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/HotReloader/HotReloader.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/I18n/Time.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\Time\\) of method CodeIgniter\\\\I18n\\\\Time\\:\\:setTimestamp\\(\\) should be covariant with return type \\(static\\(DateTimeImmutable\\)\\) of method DateTimeImmutable\\:\\:setTimestamp\\(\\)$#',
 	'count' => 1,
@@ -2421,11 +2376,6 @@
 	'count' => 4,
 	'path' => __DIR__ . '/system/I18n/Time.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/I18n/TimeLegacy.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\TimeLegacy\\) of method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:setTimestamp\\(\\) should be covariant with return type \\(static\\(DateTime\\)\\) of method DateTime\\:\\:setTimestamp\\(\\)$#',
 	'count' => 1,
@@ -2473,7 +2423,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 10,
+	'count' => 9,
 	'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php',
 ];
 $ignoreErrors[] = [
@@ -2523,7 +2473,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 16,
+	'count' => 15,
 	'path' => __DIR__ . '/system/Model.php',
 ];
 $ignoreErrors[] = [
@@ -2563,7 +2513,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Pager/Pager.php',
 ];
 $ignoreErrors[] = [
@@ -2603,14 +2553,9 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/RESTful/ResourceController.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/Router/AutoRouter.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#',
 	'count' => 1,
@@ -2638,7 +2583,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
+	'count' => 6,
 	'path' => __DIR__ . '/system/Router/RouteCollection.php',
 ];
 $ignoreErrors[] = [
@@ -2798,7 +2743,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
+	'count' => 3,
 	'path' => __DIR__ . '/system/Router/Router.php',
 ];
 $ignoreErrors[] = [
@@ -2923,7 +2868,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Session/Handlers/MemcachedHandler.php',
 ];
 $ignoreErrors[] = [
@@ -2933,7 +2878,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 4,
 	'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php',
 ];
 $ignoreErrors[] = [
@@ -2948,7 +2893,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 12,
+	'count' => 9,
 	'path' => __DIR__ . '/system/Session/Session.php',
 ];
 $ignoreErrors[] = [
@@ -3278,7 +3223,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 10,
+	'count' => 6,
 	'path' => __DIR__ . '/system/Test/FeatureTestCase.php',
 ];
 $ignoreErrors[] = [
@@ -3563,7 +3508,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php',
 ];
 $ignoreErrors[] = [
@@ -3816,11 +3761,6 @@
 	'count' => 6,
 	'path' => __DIR__ . '/system/Validation/FileRules.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
-	'path' => __DIR__ . '/system/Validation/FormatRules.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 8,
@@ -3833,7 +3773,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 3,
 	'path' => __DIR__ . '/system/Validation/Validation.php',
 ];
 $ignoreErrors[] = [
@@ -3863,7 +3803,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 4,
 	'path' => __DIR__ . '/system/View/Parser.php',
 ];
 $ignoreErrors[] = [

From 6e03597c72304116515944cdf00411398eab3b95 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 09:31:46 +0900
Subject: [PATCH 343/380] fix: incorrect rector refactoring

---
 system/Email/Email.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Email/Email.php b/system/Email/Email.php
index 22f20ae6ce3d..d18b40ff7cef 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1236,13 +1236,13 @@ protected function buildMessage()
                     . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
                     . '--' . $altBoundary . '--' . $this->newline . $this->newline;
 
-                if ($relBoundary !== '' && $relBoundary !== '0') {
+                if (isset($relBoundary)) {
                     $body .= $this->newline . $this->newline;
                     $this->appendAttachments($body, $relBoundary, 'related');
                 }
 
                 // multipart/mixed attachments
-                if ($atcBoundary !== '' && $atcBoundary !== '0') {
+                if (isset($atcBoundary)) {
                     $body .= $this->newline . $this->newline;
                     $this->appendAttachments($body, $atcBoundary, 'mixed');
                 }

From 6ba9f44fe9a0763ff97e22a1004f8c77c866303c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 09:32:29 +0900
Subject: [PATCH 344/380] refactor: remove unneeded if

---
 system/Session/Handlers/MemcachedHandler.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index 094962dc8878..aa0c1cd3a4ff 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -70,9 +70,7 @@ public function __construct(SessionConfig $config, string $ipAddress)
             $this->keyPrefix .= $this->ipAddress . ':';
         }
 
-        if ($this->keyPrefix !== '' && $this->keyPrefix !== '0') {
-            ini_set('memcached.sess_prefix', $this->keyPrefix);
-        }
+        ini_set('memcached.sess_prefix', $this->keyPrefix);
     }
 
     /**

From 23a5c929f32450e0a0c430c79352d2c5c68854a3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 09:32:54 +0900
Subject: [PATCH 345/380] refactor: remove unneeded condition

---
 system/Test/FeatureTestCase.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index cecc67c4eead..768ed961d9f8 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -374,13 +374,16 @@ protected function setRequestBody($request, ?array $params = null)
             if ($params === null || $params === []) {
                 $params = $request->fetchGlobal('request');
             }
+
             $formatMime = '';
+
             if ($this->bodyFormat === 'json') {
                 $formatMime = 'application/json';
             } elseif ($this->bodyFormat === 'xml') {
                 $formatMime = 'application/xml';
             }
-            if ($formatMime !== '' && $formatMime !== '0' && ! empty($params)) {
+
+            if ($formatMime !== '' && ! empty($params)) {
                 $formatted = Services::format()->getFormatter($formatMime)->format($params);
                 $request->setBody($formatted);
                 $request->setHeader('Content-Type', $formatMime);

From 271802490624a2130a96644e68f2fc999f4f2908 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 11:45:36 +0900
Subject: [PATCH 346/380] fix: remove unneeded conditions

---
 system/API/ResponseTrait.php                  |  2 +-
 system/Autoloader/FileLocator.php             | 30 ++++++++++---------
 system/CLI/CLI.php                            |  2 +-
 system/Cache/CacheFactory.php                 |  7 +++--
 system/Common.php                             | 17 +++++++----
 system/Database/BaseBuilder.php               | 15 +++++-----
 system/Database/Database.php                  |  2 +-
 system/Database/MigrationRunner.php           |  2 +-
 system/Database/SQLSRV/Connection.php         |  2 +-
 system/Database/Seeder.php                    |  2 +-
 system/Debug/BaseExceptionHandler.php         |  2 +-
 system/Debug/Exceptions.php                   |  2 +-
 system/Debug/Timer.php                        |  2 +-
 system/HTTP/CLIRequest.php                    |  2 +-
 system/HTTP/ContentSecurityPolicy.php         |  2 +-
 system/HTTP/IncomingRequest.php               |  2 +-
 system/HTTP/Negotiate.php                     |  4 +--
 system/HTTP/ResponseTrait.php                 |  6 ++--
 system/HTTP/URI.php                           | 10 +++----
 system/HTTP/UserAgent.php                     |  2 +-
 system/Helpers/date_helper.php                |  4 ++-
 system/Helpers/html_helper.php                | 10 +++----
 system/Helpers/number_helper.php              | 13 ++++----
 system/Honeypot/Honeypot.php                  |  2 +-
 system/I18n/TimeTrait.php                     | 18 +++++++----
 system/Images/Handlers/BaseHandler.php        |  2 ++
 system/Images/Handlers/GDHandler.php          |  4 ++-
 system/Images/Handlers/ImageMagickHandler.php |  4 ++-
 system/Images/ImageHandlerInterface.php       |  2 +-
 system/Model.php                              |  4 ++-
 system/Router/AutoRouter.php                  |  6 ++--
 system/Router/RouteCollection.php             |  7 +++--
 system/Router/Router.php                      |  2 +-
 system/Session/Handlers/RedisHandler.php      |  2 +-
 system/Session/Session.php                    |  8 ++---
 system/Session/SessionInterface.php           |  2 +-
 system/Test/FeatureTestCase.php               |  4 +--
 system/Test/FeatureTestTrait.php              |  3 +-
 system/Validation/FormatRules.php             |  8 +++--
 system/Validation/Validation.php              |  9 ++++--
 system/Validation/ValidationInterface.php     |  2 ++
 system/View/Parser.php                        |  8 ++---
 42 files changed, 139 insertions(+), 100 deletions(-)

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index e05de280d95f..d5b198ae93fb 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -94,7 +94,7 @@ protected function respond($data = null, ?int $status = null, string $message =
             $output = null;
             $this->format($data);
         } else {
-            $status = $status === null || $status === 0 ? 200 : $status;
+            $status ??= 200;
             $output = $this->format($data);
         }
 
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index a6376e18d7a7..11aa56edc4f7 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -35,14 +35,14 @@ public function __construct(Autoloader $autoloader)
      * Attempts to locate a file by examining the name for a namespace
      * and looking through the PSR-4 namespaced files that we know about.
      *
-     * @param string      $file   The relative file path or namespaced file to
-     *                            locate. If not namespaced, search in the app
-     *                            folder.
-     * @param string|null $folder The folder within the namespace that we should
-     *                            look for the file. If $file does not contain
-     *                            this value, it will be appended to the namespace
-     *                            folder.
-     * @param string      $ext    The file extension the file should have.
+     * @param string                $file   The relative file path or namespaced file to
+     *                                      locate. If not namespaced, search in the app
+     *                                      folder.
+     * @param non-empty-string|null $folder The folder within the namespace that we should
+     *                                      look for the file. If $file does not contain
+     *                                      this value, it will be appended to the namespace
+     *                                      folder.
+     * @param string                $ext    The file extension the file should have.
      *
      * @return false|string The path to the file, or false if not found.
      */
@@ -51,7 +51,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         $file = $this->ensureExt($file, $ext);
 
         // Clears the folder name if it is at the beginning of the filename
-        if ($folder !== null && $folder !== '' && $folder !== '0' && strpos($file, $folder) === 0) {
+        if ($folder !== null && strpos($file, $folder) === 0) {
             $file = substr($file, strlen($folder . '/'));
         }
 
@@ -101,7 +101,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
             // If we have a folder name, then the calling function
             // expects this file to be within that folder, like 'Views',
             // or 'libraries'.
-            if ($folder !== null && $folder !== '' && $folder !== '0' && strpos($path . $filename, '/' . $folder . '/') === false) {
+            if ($folder !== null && strpos($path . $filename, '/' . $folder . '/') === false) {
                 $path .= trim($folder, '/') . '/';
             }
 
@@ -154,7 +154,7 @@ public function getClassname(string $file): string
             }
         }
 
-        if ($className === '' || $className === '0') {
+        if ($className === '') {
             return '';
         }
 
@@ -305,7 +305,7 @@ public function findQualifiedNameFromPath(string $path)
      */
     public function listFiles(string $path): array
     {
-        if ($path === '' || $path === '0') {
+        if ($path === '') {
             return [];
         }
 
@@ -338,7 +338,7 @@ public function listFiles(string $path): array
      */
     public function listNamespaceFiles(string $prefix, string $path): array
     {
-        if ($path === '' || $path === '0' || ($prefix === '' || $prefix === '0')) {
+        if ($path === '' || ($prefix === '')) {
             return [];
         }
 
@@ -368,11 +368,13 @@ public function listNamespaceFiles(string $prefix, string $path): array
      * Checks the app folder to see if the file can be found.
      * Only for use with filenames that DO NOT include namespacing.
      *
+     * @param non-empty-string|null $folder
+     *
      * @return false|string The path to the file, or false if not found.
      */
     protected function legacyLocate(string $file, ?string $folder = null)
     {
-        $path = APPPATH . ($folder === null || $folder === '' || $folder === '0' ? $file : $folder . '/' . $file);
+        $path = APPPATH . ($folder === null ? $file : $folder . '/' . $file);
         $path = realpath($path) ?: $path;
 
         if (is_file($path)) {
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index e9c5d2965926..9a50e4038184 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -849,7 +849,7 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
      */
     public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string
     {
-        if ($string === null || $string === '' || $string === '0') {
+        if ($string === null || $string === '') {
             return '';
         }
 
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index 02df55860ccf..6402b002866d 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -40,6 +40,9 @@ class CacheFactory
     /**
      * Attempts to create the desired cache handler, based upon the
      *
+     * @param non-empty-string|null $handler
+     * @param non-empty-string|null $backup
+     *
      * @return CacheInterface
      */
     public static function getHandler(Cache $config, ?string $handler = null, ?string $backup = null)
@@ -52,8 +55,8 @@ public static function getHandler(Cache $config, ?string $handler = null, ?strin
             throw CacheException::forNoBackup();
         }
 
-        $handler = $handler !== null && $handler !== '' && $handler !== '0' ? $handler : $config->handler;
-        $backup  = $backup !== null && $backup !== '' && $backup !== '0' ? $backup : $config->backupHandler;
+        $handler ??= $config->handler;
+        $backup ??= $config->backupHandler;
 
         if (! array_key_exists($handler, $config->validHandlers) || ! array_key_exists($backup, $config->validHandlers)) {
             throw CacheException::forHandlerNotFound();
diff --git a/system/Common.php b/system/Common.php
index 34ac66120768..3ff931f73de3 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -288,20 +288,24 @@ function csrf_hash(): string
 if (! function_exists('csrf_field')) {
     /**
      * Generates a hidden input field for use within manually generated forms.
+     *
+     * @param non-empty-string|null $id
      */
     function csrf_field(?string $id = null): string
     {
-        return '<input type="hidden"' . ($id !== null && $id !== '' && $id !== '0' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<input type="hidden"' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
 if (! function_exists('csrf_meta')) {
     /**
      * Generates a meta tag for use within javascript calls.
+     *
+     * @param non-empty-string|null $id
      */
     function csrf_meta(?string $id = null): string
     {
-        return '<meta' . ($id !== null && $id !== '' && $id !== '0' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<meta' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
@@ -850,13 +854,13 @@ function old(string $key, $default = null, $escape = 'html')
      *
      * If more control is needed, you must use $response->redirect explicitly.
      *
-     * @param string|null $route Route name or Controller::method
+     * @param non-empty-string|null $route Route name or Controller::method
      */
     function redirect(?string $route = null): RedirectResponse
     {
         $response = Services::redirectresponse(null, true);
 
-        if ($route !== null && $route !== '' && $route !== '0') {
+        if ($route !== null) {
             return $response->route($route);
         }
 
@@ -1121,15 +1125,16 @@ function stringify_attributes($attributes, bool $js = false): string
      * returns its return value if any.
      * Otherwise will start or stop the timer intelligently.
      *
+     * @param non-empty-string|null    $name
      * @param (callable(): mixed)|null $callable
      *
-     * @return Timer
+     * @return mixed|Timer
      */
     function timer(?string $name = null, ?callable $callable = null)
     {
         $timer = Services::timer();
 
-        if ($name === null || $name === '' || $name === '0') {
+        if ($name === null) {
             return $timer;
         }
 
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index b2a053465e73..9d43e5577943 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -920,6 +920,7 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
      * @used-by whereNotIn()
      * @used-by orWhereNotIn()
      *
+     * @param non-empty-string|null          $key
      * @param array|BaseBuilder|Closure|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
@@ -928,7 +929,7 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
      */
     protected function _whereIn(?string $key = null, $values = null, bool $not = false, string $type = 'AND ', ?bool $escape = null, string $clause = 'QBWhere')
     {
-        if ($key === null || $key === '' || $key === '0' || ! is_string($key)) {
+        if ($key === null || $key === '') {
             throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
         }
 
@@ -1434,7 +1435,7 @@ public function orHaving($key, $value = null, ?bool $escape = null)
     public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
     {
         $qbOrderBy = [];
-        if ($orderBy === '' || $orderBy === '0') {
+        if ($orderBy === '') {
             return $this;
         }
 
@@ -1505,7 +1506,7 @@ public function limit(?int $value = null, ?int $offset = 0)
     public function offset(int $offset)
     {
         if ($offset !== 0) {
-            $this->QBOffset = (int) $offset;
+            $this->QBOffset = $offset;
         }
 
         return $this;
@@ -3265,10 +3266,10 @@ protected function isLiteral(string $str): bool
     {
         $str = trim($str);
 
-        if ($str === '' || $str === '0'
-                        || ctype_digit($str)
-                        || (string) (float) $str === $str
-                        || in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
+        if ($str === ''
+            || ctype_digit($str)
+            || (string) (float) $str === $str
+            || in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
         ) {
             return true;
         }
diff --git a/system/Database/Database.php b/system/Database/Database.php
index 2a4aa20678a9..58a63e152fba 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -104,7 +104,7 @@ protected function parseDSN(array $params): array
             'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : '',
         ];
 
-        if (isset($dsn['query']) && ($dsn['query'] !== '' && $dsn['query'] !== '0')) {
+        if (isset($dsn['query']) && ($dsn['query'] !== '')) {
             parse_str($dsn['query'], $extra);
 
             foreach ($extra as $key => $val) {
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 722538ce2cac..435c11852ae0 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -639,7 +639,7 @@ public function getHistory(string $group = 'default'): array
         $builder = $this->db->table($this->table);
 
         // If group was specified then use it
-        if ($group !== '' && $group !== '0') {
+        if ($group !== '') {
             $builder->where('group', $group);
         }
 
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 21ca9ad70411..bd9a22e94975 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -444,7 +444,7 @@ public function affectedRows(): int
      */
     public function setDatabase(?string $databaseName = null)
     {
-        if ($databaseName === null || $databaseName === '' || $databaseName === '0') {
+        if ($databaseName === null || $databaseName === '') {
             $databaseName = $this->database;
         }
 
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index c02dbfc7d951..c0f267d2fee0 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -78,7 +78,7 @@ public function __construct(Database $config, ?BaseConnection $db = null)
     {
         $this->seedPath = $config->filesPath ?? APPPATH . 'Database/';
 
-        if ($this->seedPath === '' || $this->seedPath === '0') {
+        if ($this->seedPath === '') {
             throw new InvalidArgumentException('Invalid filesPath set in the Config\Database.');
         }
 
diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index 8627ad1e3d1e..33dd126ff1ec 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -161,7 +161,7 @@ protected static function describeMemory(int $bytes): string
      */
     protected static function highlightFile(string $file, int $lineNumber, int $lines = 15)
     {
-        if ($file === '' || $file === '0' || ! is_readable($file)) {
+        if ($file === '' || ! is_readable($file)) {
             return false;
         }
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 86e8834ecc3c..1f5a5b52f03b 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -522,7 +522,7 @@ public static function describeMemory(int $bytes): string
      */
     public static function highlightFile(string $file, int $lineNumber, int $lines = 15)
     {
-        if ($file === '' || $file === '0' || ! is_readable($file)) {
+        if ($file === '' || ! is_readable($file)) {
             return false;
         }
 
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 103094b0a641..45c0bf865c8e 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -136,7 +136,7 @@ public function has(string $name): bool
      * @param string            $name     The name of the timer
      * @param callable(): mixed $callable callable to be executed
      *
-     * @return array|bool|float|int|object|resource|string|null
+     * @return mixed
      */
     public function record(string $name, callable $callable)
     {
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 30be13835a90..01823dbfc4c5 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -95,7 +95,7 @@ public function getPath(): string
     {
         $path = implode('/', $this->segments);
 
-        return $path === '' || $path === '0' ? '' : $path;
+        return ($path === '') ? '' : $path;
     }
 
     /**
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 951d8fa2960f..f4970bf7c544 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -790,7 +790,7 @@ protected function addToHeader(string $name, $values = null)
         $reportSources = [];
 
         foreach ($values as $value => $reportOnly) {
-            if (is_numeric($value) && is_string($reportOnly) && ($reportOnly !== '' && $reportOnly !== '0')) {
+            if (is_numeric($value) && is_string($reportOnly) && ($reportOnly !== '')) {
                 $value      = $reportOnly;
                 $reportOnly = $this->reportOnly;
             }
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 82287d66c3d2..8bc246f7956d 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -256,7 +256,7 @@ protected function detectURI(string $protocol, string $baseURL)
      */
     public function detectPath(string $protocol = ''): string
     {
-        if ($protocol === '' || $protocol === '0') {
+        if ($protocol === '') {
             $protocol = 'REQUEST_URI';
         }
 
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index 21a01e05e023..9c903908695f 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -93,7 +93,7 @@ public function charset(array $supported): string
 
         // If no charset is shown as a match, ignore the directive
         // as allowed by the RFC, and tell it a default value.
-        if ($match === '' || $match === '0') {
+        if ($match === '') {
             return 'utf-8';
         }
 
@@ -158,7 +158,7 @@ protected function getBestMatch(
             throw HTTPException::forEmptySupportedNegotiations();
         }
 
-        if ($header === null || $header === '' || $header === '0') {
+        if ($header === null || $header === '') {
             return $strictMatch ? '' : $supported[0];
         }
 
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 8cdf8516e773..b385bfea45de 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -156,13 +156,13 @@ public function setStatusCode(int $code, string $reason = '')
         }
 
         // Unknown and no message?
-        if (! array_key_exists($code, static::$statusCodes) && ($reason === '' || $reason === '0')) {
+        if (! array_key_exists($code, static::$statusCodes) && ($reason === '')) {
             throw HTTPException::forUnkownStatusCode($code);
         }
 
         $this->statusCode = $code;
 
-        $this->reason = $reason !== '' && $reason !== '0' ? $reason : static::$statusCodes[$code];
+        $this->reason = ($reason !== '') ? $reason : static::$statusCodes[$code];
 
         return $this;
     }
@@ -226,7 +226,7 @@ public function setLink(PagerInterface $pager)
     public function setContentType(string $mime, string $charset = 'UTF-8')
     {
         // add charset attribute if not already there and provided as parm
-        if ((strpos($mime, 'charset=') < 1) && ($charset !== '' && $charset !== '0')) {
+        if ((strpos($mime, 'charset=') < 1) && ($charset !== '')) {
             $mime .= '; charset=' . $charset;
         }
 
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index e5df4e94c43c..5bec38013bf2 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -163,11 +163,11 @@ public static function createURIString(
         ?string $fragment = null
     ): string {
         $uri = '';
-        if ($scheme !== null && $scheme !== '' && $scheme !== '0') {
+        if ($scheme !== null && $scheme !== '') {
             $uri .= $scheme . '://';
         }
 
-        if ($authority !== null && $authority !== '' && $authority !== '0') {
+        if ($authority !== null && $authority !== '') {
             $uri .= $authority;
         }
 
@@ -886,7 +886,7 @@ public function setQuery(string $query)
         }
 
         // Can't have leading ?
-        if ($query !== '' && $query !== '0' && strpos($query, '?') === 0) {
+        if ($query !== '' && strpos($query, '?') === 0) {
             $query = substr($query, 1);
         }
 
@@ -1097,7 +1097,7 @@ public function resolveRelativeURI(string $uri)
         $transformed = clone $relative;
 
         // 5.2.2 Transform References in a non-strict method (no scheme)
-        if ($relative->getAuthority() !== '' && $relative->getAuthority() !== '0') {
+        if ($relative->getAuthority() !== '') {
             $transformed
                 ->setAuthority($relative->getAuthority())
                 ->setPath($relative->getPath())
@@ -1139,7 +1139,7 @@ public function resolveRelativeURI(string $uri)
      */
     protected function mergePaths(self $base, self $reference): string
     {
-        if ($base->getAuthority() !== '' && $base->getAuthority() !== '0' && $base->getPath() === '') {
+        if ($base->getAuthority() !== '' && $base->getPath() === '') {
             return '/' . ltrim($reference->getPath(), '/ ');
         }
 
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 3ae4d117163b..2294b02a2b48 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -260,7 +260,7 @@ public function parse(string $string)
         // Set the new user-agent string and parse it, unless empty
         $this->agent = $string;
 
-        if ($string !== '' && $string !== '0') {
+        if ($string !== '') {
             $this->compileData();
         }
     }
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index 2e898c424e00..cf1dc33a74ea 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -20,11 +20,13 @@
      * Returns Time::now()->getTimestamp() based on the timezone parameter or on the
      * app_timezone() setting
      *
+     * @param non-empty-string|null $timezone
+     *
      * @throws Exception
      */
     function now(?string $timezone = null): int
     {
-        $timezone = $timezone === null || $timezone === '' || $timezone === '0' ? app_timezone() : $timezone;
+        $timezone = ($timezone === null || $timezone === '') ? app_timezone() : $timezone;
 
         if ($timezone === 'local' || $timezone === date_default_timezone_get()) {
             return Time::now()->getTimestamp();
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 5df62efcc9de..075dcd510b43 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -313,7 +313,7 @@ function video($src, string $unsupportedMessage = '', string $attributes = '', a
             $video .= _space_indent() . $track . "\n";
         }
 
-        if ($unsupportedMessage !== '' && $unsupportedMessage !== '0') {
+        if ($unsupportedMessage !== '') {
             $video .= _space_indent()
                     . $unsupportedMessage
                     . "\n";
@@ -359,7 +359,7 @@ function audio($src, string $unsupportedMessage = '', string $attributes = '', a
             $audio .= "\n" . _space_indent() . $track;
         }
 
-        if ($unsupportedMessage !== '' && $unsupportedMessage !== '0') {
+        if ($unsupportedMessage !== '') {
             $audio .= "\n" . _space_indent() . $unsupportedMessage . "\n";
         }
 
@@ -377,7 +377,7 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
     {
         $media = '<' . $name;
 
-        if ($attributes === '' || $attributes === '0') {
+        if ($attributes === '') {
             $media .= '>';
         } else {
             $media .= ' ' . $attributes . '>';
@@ -393,7 +393,7 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
             $media .= _space_indent() . $track . "\n";
         }
 
-        if ($unsupportedMessage !== '' && $unsupportedMessage !== '0') {
+        if ($unsupportedMessage !== '') {
             $media .= _space_indent() . $unsupportedMessage . "\n";
         }
 
@@ -421,7 +421,7 @@ function source(string $src, string $type = 'unknown', string $attributes = '',
         $source = '<source src="' . $src
                 . '" type="' . $type . '"';
 
-        if ($attributes !== '' && $attributes !== '0') {
+        if ($attributes !== '') {
             $source .= ' ' . $attributes;
         }
 
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 4bb09340656f..8ca5d3e2320f 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -15,7 +15,8 @@
     /**
      * Formats a numbers as bytes, based on size, and adds the appropriate suffix
      *
-     * @param int|string $num Will be cast as int
+     * @param int|string            $num    Will be cast as int
+     * @param non-empty-string|null $locale [optional]
      *
      * @return bool|string
      */
@@ -32,7 +33,7 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
 
         // ignore sub part
         $generalLocale = $locale;
-        if ($locale !== null && $locale !== '' && $locale !== '0' && ($underscorePos = strpos($locale, '_'))) {
+        if ($locale !== null && $locale !== '' && ($underscorePos = strpos($locale, '_'))) {
             $generalLocale = substr($locale, 0, $underscorePos);
         }
 
@@ -68,9 +69,9 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
      *
      * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers
      *
-     * @param int|string  $num       Will be cast as int
-     * @param int         $precision [optional] The optional number of decimal digits to round to.
-     * @param string|null $locale    [optional]
+     * @param int|string            $num       Will be cast as int
+     * @param int                   $precision [optional] The optional number of decimal digits to round to.
+     * @param non-empty-string|null $locale    [optional]
      *
      * @return bool|string
      */
@@ -88,7 +89,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
 
         // ignore sub part
         $generalLocale = $locale;
-        if ($locale !== null && $locale !== '' && $locale !== '0' && ($underscorePos = strpos($locale, '_'))) {
+        if ($locale !== null && $locale !== '' && ($underscorePos = strpos($locale, '_'))) {
             $generalLocale = substr($locale, 0, $underscorePos);
         }
 
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index 65e2db8facdf..c0998c475bbc 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -44,7 +44,7 @@ public function __construct(HoneypotConfig $config)
             throw HoneypotException::forNoHiddenValue();
         }
 
-        if ($this->config->container === '' || $this->config->container === '0' || strpos($this->config->container, '{template}') === false) {
+        if ($this->config->container === '' || strpos($this->config->container, '{template}') === false) {
             $this->config->container = '<div style="display:none">{template}</div>';
         }
 
diff --git a/system/I18n/TimeTrait.php b/system/I18n/TimeTrait.php
index 9e12e8d9f69e..93f03d8a84bd 100644
--- a/system/I18n/TimeTrait.php
+++ b/system/I18n/TimeTrait.php
@@ -212,14 +212,22 @@ public static function createFromTime(?int $hour = null, ?int $minutes = null, ?
      *
      * @throws Exception
      */
-    public static function create(?int $year = null, ?int $month = null, ?int $day = null, ?int $hour = null, ?int $minutes = null, ?int $seconds = null, $timezone = null, ?string $locale = null)
-    {
+    public static function create(
+        ?int $year = null,
+        ?int $month = null,
+        ?int $day = null,
+        ?int $hour = null,
+        ?int $minutes = null,
+        ?int $seconds = null,
+        $timezone = null,
+        ?string $locale = null
+    ) {
         $year ??= date('Y');
         $month ??= date('m');
         $day ??= date('d');
-        $hour    = $hour === null    || $hour === 0 ? 0 : $hour;
-        $minutes = $minutes === null || $minutes === 0 ? 0 : $minutes;
-        $seconds = $seconds === null || $seconds === 0 ? 0 : $seconds;
+        $hour ??= 0;
+        $minutes ??= 0;
+        $seconds ??= 0;
 
         return new self(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
     }
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index cf23fd0fcd23..92644eede3db 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -691,6 +691,8 @@ abstract public function getVersion();
      *    $image->resize(100, 200, true)
      *          ->save($target);
      *
+     * @param non-empty-string|null $target
+     *
      * @return bool
      */
     abstract public function save(?string $target = null, int $quality = 90);
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index 32540e1afe67..f2cd55874044 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -204,11 +204,13 @@ protected function process(string $action)
      * Example:
      *    $image->resize(100, 200, true)
      *          ->save();
+     *
+     * @param non-empty-string|null $target
      */
     public function save(?string $target = null, int $quality = 90): bool
     {
         $original = $target;
-        $target   = $target === null || $target === '' || $target === '0' ? $this->image()->getPathname() : $target;
+        $target   = ($target === null || $target === '') ? $this->image()->getPathname() : $target;
 
         // If no new resource has been created, then we're
         // simply copy the existing one.
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 5f020536caed..7dd5e5d755ee 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -223,11 +223,13 @@ protected function process(string $action, int $quality = 100): array
      * Example:
      *    $image->resize(100, 200, true)
      *          ->save();
+     *
+     * @param non-empty-string|null $target
      */
     public function save(?string $target = null, int $quality = 90): bool
     {
         $original = $target;
-        $target   = $target === null || $target === '' || $target === '0' ? $this->image()->getPathname() : $target;
+        $target   = ($target === null || $target === '') ? $this->image()->getPathname() : $target;
 
         // If no new resource has been created, then we're
         // simply copy the existing one.
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index 1c3593a99bd4..76a016b08918 100644
--- a/system/Images/ImageHandlerInterface.php
+++ b/system/Images/ImageHandlerInterface.php
@@ -132,7 +132,7 @@ public function text(string $text, array $options = []);
      *    $image->resize(100, 200, true)
      *          ->save($target);
      *
-     * @param string|null $target The path to save the file to.
+     * @param non-empty-string|null $target The path to save the file to.
      *
      * @return bool
      */
diff --git a/system/Model.php b/system/Model.php
index f72213361de9..d264107fc4dc 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -627,6 +627,8 @@ public function countAllResults(bool $reset = true, bool $test = false)
     /**
      * Provides a shared instance of the Query Builder.
      *
+     * @param non-empty-string|null $table
+     *
      * @return BaseBuilder
      *
      * @throws ModelException
@@ -650,7 +652,7 @@ public function builder(?string $table = null)
             throw ModelException::forNoPrimaryKey(static::class);
         }
 
-        $table = $table === null || $table === '' || $table === '0' ? $this->table : $table;
+        $table = ($table === null || $table === '') ? $this->table : $table;
 
         // Ensure we have a good db connection
         if (! $this->db instanceof BaseConnection) {
diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index fd7bc7e154df..87a5b3ac3bc1 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -259,7 +259,7 @@ private function isValidSegment(string $segment): bool
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
-        if ($dir === null || $dir === '' || $dir === '0') {
+        if ($dir === null || $dir === '') {
             $this->directory = null;
 
             return;
@@ -275,7 +275,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
             }
         }
 
-        if ($append !== true || ($this->directory === null || $this->directory === '' || $this->directory === '0')) {
+        if ($append !== true || ($this->directory === null || $this->directory === '')) {
             $this->directory = trim($dir, '/') . '/';
         } else {
             $this->directory .= trim($dir, '/') . '/';
@@ -290,7 +290,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
      */
     public function directory(): string
     {
-        return $this->directory !== null && $this->directory !== '' && $this->directory !== '0' ? $this->directory : '';
+        return ($this->directory !== null && $this->directory !== '') ? $this->directory : '';
     }
 
     private function controllerName(): string
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 3edd47c99737..4407c1076f3d 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -560,11 +560,12 @@ public function shouldAutoRoute(): bool
     /**
      * Returns the raw array of available routes.
      *
-     * @param bool $includeWildcard Whether to include '*' routes.
+     * @param non-empty-string|null $verb
+     * @param bool                  $includeWildcard Whether to include '*' routes.
      */
     public function getRoutes(?string $verb = null, bool $includeWildcard = true): array
     {
-        if ($verb === null || $verb === '' || $verb === '0') {
+        if ($verb === null || $verb === '') {
             $verb = $this->getHTTPVerb();
         }
 
@@ -995,7 +996,7 @@ public function presenter(string $name, ?array $options = null): RouteCollection
      */
     public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): RouteCollectionInterface
     {
-        if ($from === '' || $from === '0' || empty($to)) {
+        if ($from === '' || empty($to)) {
             throw new InvalidArgumentException('You must supply the parameters: from, to.');
         }
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index ed3ddf16e858..723c292cb931 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -589,7 +589,7 @@ protected function scanControllers(array $segments): array
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
-        if ($dir === null || $dir === '' || $dir === '0') {
+        if ($dir === null || $dir === '') {
             $this->directory = null;
         }
 
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index d14e66221a53..b429792929b4 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -71,7 +71,7 @@ public function __construct(SessionConfig $config, string $ipAddress)
         parent::__construct($config, $ipAddress);
 
         // Store Session configurations
-        $this->sessionExpiration = $config->expiration === 0
+        $this->sessionExpiration = ($config->expiration === 0)
             ? (int) ini_get('session.gc_maxlifetime')
             : $config->expiration;
         // Add sessionCookieName for multiple session cookies.
diff --git a/system/Session/Session.php b/system/Session/Session.php
index b698387de422..7dfe5898d78f 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -299,7 +299,7 @@ protected function configure()
             ini_set('session.gc_maxlifetime', (string) $this->config->expiration);
         }
 
-        if ($this->config->savePath !== '' && $this->config->savePath !== '0') {
+        if ($this->config->savePath !== '') {
             ini_set('session.save_path', $this->config->savePath);
         }
 
@@ -486,13 +486,13 @@ public function set($data, $value = null)
      *
      * Replaces the legacy method $session->userdata();
      *
-     * @param string|null $key Identifier of the session property to retrieve
+     * @param non-empty-string|null $key Identifier of the session property to retrieve
      *
      * @return array|bool|float|int|object|string|null The property value(s)
      */
     public function get(?string $key = null)
     {
-        if ($key !== null && $key !== '' && $key !== '0' && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
+        if ($key !== null && $key !== '' && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
             return $value;
         }
 
@@ -500,7 +500,7 @@ public function get(?string $key = null)
             return $key === null ? [] : null;
         }
 
-        if ($key !== null && $key !== '' && $key !== '0') {
+        if ($key !== null && $key !== '') {
             return null;
         }
 
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
index e78736bf34b7..424834c79639 100644
--- a/system/Session/SessionInterface.php
+++ b/system/Session/SessionInterface.php
@@ -51,7 +51,7 @@ public function set($data, $value = null);
      *
      * Replaces the legacy method $session->userdata();
      *
-     * @param string $key Identifier of the session property to retrieve
+     * @param non-empty-string|null $key Identifier of the session property to retrieve
      *
      * @return array|bool|float|int|object|string|null The property value(s)
      */
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 768ed961d9f8..10ee84043be3 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -186,7 +186,7 @@ public function call(string $method, string $path, ?array $params = null)
             ->run($routes, true);
 
         $output = \ob_get_contents();
-        if (empty($response->getBody()) && ! ($output === '' || $output === '0' || $output === false)) {
+        if (empty($response->getBody()) && ! ($output === '' || $output === false)) {
             $response->setBody($output);
         }
 
@@ -335,7 +335,7 @@ protected function populateGlobals(string $method, $request, ?array $params = nu
     {
         // $params should set the query vars if present,
         // otherwise set it from the URL.
-        $get = $params !== null && $params !== [] && $method === 'get'
+        $get = ($params !== null && $params !== [] && $method === 'get')
             ? $params
             : $this->getPrivateProperty($request->getUri(), 'query');
 
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 7bcb56242428..565e4e892780 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -326,7 +326,8 @@ protected function setupHeaders(IncomingRequest $request)
      *
      * Always populate the GET vars based on the URI.
      *
-     * @param string $method HTTP verb
+     * @param string               $method HTTP verb
+     * @param non-empty-array|null $params
      *
      * @return Request
      *
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index a3618ae528d6..88775d14de8f 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -252,7 +252,7 @@ public function valid_emails(?string $str = null): bool
      */
     public function valid_ip(?string $ip = null, ?string $which = null): bool
     {
-        if ($ip === null || $ip === '' || $ip === '0') {
+        if ($ip === null || $ip === '') {
             return false;
         }
 
@@ -281,7 +281,7 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
      */
     public function valid_url(?string $str = null): bool
     {
-        if ($str === null || $str === '' || $str === '0') {
+        if ($str === null || $str === '') {
             return false;
         }
 
@@ -322,6 +322,8 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
 
     /**
      * Checks for a valid date and matches a given date format
+     *
+     * @param non-empty-string|null $format
      */
     public function valid_date(?string $str = null, ?string $format = null): bool
     {
@@ -329,7 +331,7 @@ public function valid_date(?string $str = null, ?string $format = null): bool
             return false;
         }
 
-        if ($format === null || $format === '' || $format === '0') {
+        if ($format === null || $format === '') {
             return strtotime($str) !== false;
         }
 
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 43c52fb9aaf5..6e71aadb23f3 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -724,13 +724,15 @@ protected function loadRuleSets()
      * same format used with setRules(). Additionally, check
      * for {group}_errors for an array of custom error messages.
      *
+     * @param non-empty-string|null $group
+     *
      * @return array<int, array> [rules, customErrors]
      *
      * @throws ValidationException
      */
     public function loadRuleGroup(?string $group = null)
     {
-        if ($group === null || $group === '' || $group === '0') {
+        if ($group === null || $group === '') {
             return [];
         }
 
@@ -888,7 +890,8 @@ public function setError(string $field, string $error): ValidationInterface
     /**
      * Attempts to find the appropriate error message
      *
-     * @param string|null $value The value that caused the validation to fail.
+     * @param non-empty-string|null $label
+     * @param string|null           $value The value that caused the validation to fail.
      */
     protected function getErrorMessage(
         string $rule,
@@ -912,7 +915,7 @@ protected function getErrorMessage(
             $message = lang('Validation.' . $rule);
         }
 
-        $message = str_replace('{field}', $label === null || $label === '' || $label === '0' ? $field : lang($label), $message);
+        $message = str_replace('{field}', ($label === null || $label === '') ? $field : lang($label), $message);
         $message = str_replace(
             '{param}',
             empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']),
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index 78c38468ddd0..c289afc4541d 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -134,6 +134,8 @@ public function reset(): ValidationInterface;
      * same format used with setRules(). Additionally, check
      * for {group}_errors for an array of custom error messages.
      *
+     * @param non-empty-string|null $group
+     *
      * @return array
      */
     public function loadRuleGroup(?string $group = null);
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 5c1276656613..8410ef969fca 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -185,12 +185,12 @@ public function renderString(string $template, ?array $options = null, ?bool $sa
      * so that the variable is correctly handled within the
      * parsing itself, and contexts (including raw) are respected.
      *
-     * @param string|null $context The context to escape it for: html, css, js, url, raw
-     *                             If 'raw', no escaping will happen
+     * @param non-empty-string|null $context The context to escape it for: html, css, js, url, raw
+     *                                       If 'raw', no escaping will happen
      */
     public function setData(array $data = [], ?string $context = null): RendererInterface
     {
-        if ($context !== null && $context !== '' && $context !== '0') {
+        if ($context !== null && $context !== '') {
             foreach ($data as $key => &$value) {
                 if (is_array($value)) {
                     foreach ($value as &$obj) {
@@ -592,7 +592,7 @@ protected function applyFilters(string $replace, array $filters): string
             $param = ! empty($param) ? trim($param[0], '() ') : null;
 
             // Params can be separated by commas to allow multiple parameters for the filter
-            if ($param !== null && $param !== '' && $param !== '0') {
+            if ($param !== null && $param !== '') {
                 $param = explode(',', $param);
 
                 // Clean it up

From e8980a8b83800cf105794e011a0acf4edfdee58d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 11:46:23 +0900
Subject: [PATCH 347/380] chore: vendor/bin/phpstan analyze --generate-baseline
 phpstan-baseline.php

---
 phpstan-baseline.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index b9d7da5cfdca..73120af49a06 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -861,11 +861,6 @@
 	'count' => 5,
 	'path' => __DIR__ . '/system/Cookie/Cookie.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Call to function is_string\\(\\) with non\\-falsy\\-string will always evaluate to true\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/BaseBuilder.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 30,

From 751eac2da0361a710e184a8e7040694741157a61 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Dec 2023 10:02:44 +0900
Subject: [PATCH 348/380] Revert "Merge pull request #8335 from
 codeigniter4/dependabot/github_actions/actions/download-artifact-4"

This reverts commit 9179347f0fdcab7e46e63bc836c4499ae70a4969, reversing
changes made to 3c75ca5607dc01667b1306ff98454873fa419415.
---
 .github/workflows/reusable-coveralls.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml
index 32415f80a602..a5dfc83996cb 100644
--- a/.github/workflows/reusable-coveralls.yml
+++ b/.github/workflows/reusable-coveralls.yml
@@ -24,7 +24,7 @@ jobs:
           coverage: xdebug
 
       - name: Download coverage files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: build/cov
 

From 671fe68b1e4d86b542e2b960027a2a60218eb3e5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Dec 2023 09:58:09 +0900
Subject: [PATCH 349/380] docs: add @phpstan-return

---
 system/Common.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/Common.php b/system/Common.php
index 3ff931f73de3..68aed29a9693 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1129,6 +1129,7 @@ function stringify_attributes($attributes, bool $js = false): string
      * @param (callable(): mixed)|null $callable
      *
      * @return mixed|Timer
+     * @phpstan-return ($callable is (callable(): mixed) ? mixed : Timer)
      */
     function timer(?string $name = null, ?callable $callable = null)
     {

From 83c27c56baad47f1f13aca0c46caca849ba51367 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Dec 2023 10:00:34 +0900
Subject: [PATCH 350/380] refactor: replace empty()

---
 system/Test/FeatureTestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 10ee84043be3..5c74e27a774d 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -383,7 +383,7 @@ protected function setRequestBody($request, ?array $params = null)
                 $formatMime = 'application/xml';
             }
 
-            if ($formatMime !== '' && ! empty($params)) {
+            if ($formatMime !== '' && ! ($params === null || $params === [])) {
                 $formatted = Services::format()->getFormatter($formatMime)->format($params);
                 $request->setBody($formatted);
                 $request->setHeader('Content-Type', $formatMime);

From 64866aa3c46a4e9bfc484e9da850b14329865e7f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Dec 2023 10:10:03 +0900
Subject: [PATCH 351/380] chore: remove ignoreErrors

---
 phpstan-baseline.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 73120af49a06..d4877780cf88 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -3218,7 +3218,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
+	'count' => 5,
 	'path' => __DIR__ . '/system/Test/FeatureTestCase.php',
 ];
 $ignoreErrors[] = [

From d7d395972e7251c73b09d89a263ce77bf7c9afbe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Dec 2023 12:04:03 +0900
Subject: [PATCH 352/380] docs: fix @phpstan-return type

---
 system/Common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Common.php b/system/Common.php
index 68aed29a9693..690fa3fc5b6a 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1129,7 +1129,7 @@ function stringify_attributes($attributes, bool $js = false): string
      * @param (callable(): mixed)|null $callable
      *
      * @return mixed|Timer
-     * @phpstan-return ($callable is (callable(): mixed) ? mixed : Timer)
+     * @phpstan-return ($name is null ? Timer : ($callable is (callable(): mixed) ? mixed : Timer))
      */
     function timer(?string $name = null, ?callable $callable = null)
     {

From bed91738f5750f4d55d466e8146418e701d7c24d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 21 Dec 2023 15:34:44 +0800
Subject: [PATCH 353/380] Add `replace` to composer.json

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index c28354c8206c..9b0131921c5c 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,9 @@
         "rector/rector": "0.18.12",
         "vimeo/psalm": "^5.0"
     },
+    "replace": {
+        "codeigniter4/framework": "self.version"
+    },
     "suggest": {
         "ext-curl": "If you use CURLRequest class",
         "ext-dom": "If you use TestResponse",

From 73bf083a3fa089f58a1b1b1511e40657fe992b3d Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:30:22 +0200
Subject: [PATCH 354/380] Update ViewDecoratorTrait.php

---
 system/View/ViewDecoratorTrait.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
index 3f52b72a8ab9..1bec8acf012a 100644
--- a/system/View/ViewDecoratorTrait.php
+++ b/system/View/ViewDecoratorTrait.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\View;
 
 use CodeIgniter\View\Exceptions\ViewException;
+use Config\View as ViewConfig;
 
 trait ViewDecoratorTrait
 {
@@ -21,7 +22,7 @@ trait ViewDecoratorTrait
      */
     protected function decorateOutput(string $html): string
     {
-        $decorators = $this->config->decorators ?? \config(ViewConfig::class)->decorators;
+        $decorators = $this->config->decorators ?? config(ViewConfig::class)->decorators;
 
         foreach ($decorators as $decorator) {
             if (! is_subclass_of($decorator, ViewDecoratorInterface::class)) {

From 6ab340d696ee955295b354b238f73da0bed67337 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:56:04 +0000
Subject: [PATCH 355/380] chore(deps-dev): update rector/rector requirement

Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](https://github.com/rectorphp/rector/compare/0.18.12...0.18.13)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9b0131921c5c..b9799247d5aa 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.12",
+        "rector/rector": "0.18.13",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

From 762ca838446583745adadb11e9c3cbfff3454842 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 09:53:19 +0900
Subject: [PATCH 356/380] test: fix @param types

---
 tests/system/Test/DOMParserTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index f6e33cc32250..07f3961bc640 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -91,7 +91,7 @@ public static function provideText(): iterable
     /**
      * @dataProvider provideText
      *
-     * @param mixed $text
+     * @param string $text
      */
     public function testSeeText($text): void
     {
@@ -139,7 +139,7 @@ public function testSeeFail(): void
     /**
      * @dataProvider provideText
      *
-     * @param mixed $text
+     * @param string $text
      */
     public function testSeeElement($text): void
     {

From 41c1e6318929b0f8f8275b9dabaafdc93451c3a3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 09:53:52 +0900
Subject: [PATCH 357/380] test: add test for `id="0"`

---
 tests/system/Test/DOMParserTest.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index 07f3961bc640..6df1d95c7663 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -171,6 +171,16 @@ public function testSeeElementID(): void
         $this->assertTrue($dom->see('Hello World', '#heading'));
     }
 
+    public function testSeeElementIDZero(): void
+    {
+        $dom = new DOMParser();
+
+        $html = '<html><body><h1 id="0">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
+
+        $this->assertTrue($dom->see('Hello World', '#0'));
+    }
+
     public function testSeeElementIDFails(): void
     {
         $dom = new DOMParser();

From b611d38267033a771c7b48d5eaef494ed49572b2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 10:04:00 +0900
Subject: [PATCH 358/380] docs: make @return more strict

---
 system/Test/DOMParser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index a14183eeea92..6f9156ead89c 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -231,7 +231,7 @@ protected function doXPath(?string $search, string $element, array $paths = [])
     /**
      * Look for the a selector  in the passed text.
      *
-     * @return array
+     * @return array{tag: string, id: string|null, class: string|null, attr: array<string, string>|null}
      */
     public function parseSelector(string $selector)
     {

From f4c17bbac17c4a365b6c77a85bd7cd162f055f97 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 10:07:10 +0900
Subject: [PATCH 359/380] fix: DOMParser cannot see element with `id="0"`

---
 system/Test/DOMParser.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 6f9156ead89c..1565452159f9 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -189,23 +189,23 @@ protected function doXPath(?string $search, string $element, array $paths = [])
         $path = '';
 
         // By ID
-        if (! empty($selector['id'])) {
-            $path = empty($selector['tag'])
+        if (isset($selector['id'])) {
+            $path = ($selector['tag'] === '')
                 ? "id(\"{$selector['id']}\")"
                 : "//{$selector['tag']}[@id=\"{$selector['id']}\"]";
         }
         // By Class
-        elseif (! empty($selector['class'])) {
-            $path = empty($selector['tag'])
+        elseif (isset($selector['class'])) {
+            $path = ($selector['tag'] === '')
                 ? "//*[@class=\"{$selector['class']}\"]"
                 : "//{$selector['tag']}[@class=\"{$selector['class']}\"]";
         }
         // By tag only
-        elseif (! empty($selector['tag'])) {
+        elseif ($selector['tag'] !== '') {
             $path = "//{$selector['tag']}";
         }
 
-        if (! empty($selector['attr'])) {
+        if (isset($selector['attr'])) {
             foreach ($selector['attr'] as $key => $value) {
                 $path .= "[@{$key}=\"{$value}\"]";
             }

From c03d34a14737ed5a085fdd93dd339184313a122b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 10:09:40 +0900
Subject: [PATCH 360/380] chore: remove ignoreErrors

---
 phpstan-baseline.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index d4877780cf88..65a22b8f584a 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -3171,11 +3171,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/DOMParser.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
-	'path' => __DIR__ . '/system/Test/DOMParser.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Access to an undefined property object\\:\\:\\$createdField\\.$#',
 	'count' => 1,

From 3cfbdf2b2e906dbafaa394675b238041558fd5a6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 10:34:47 +0900
Subject: [PATCH 361/380] chore: add StringClassNameToClassConstantRector
 option

---
 rector.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rector.php b/rector.php
index 6d69a0fba2fd..5be63b31e59d 100644
--- a/rector.php
+++ b/rector.php
@@ -145,9 +145,14 @@
     $rectorConfig->rule(TernaryEmptyArrayArrayDimFetchToCoalesceRector::class);
     $rectorConfig->rule(EmptyOnNullableObjectToInstanceOfRector::class);
     $rectorConfig->rule(DisallowedEmptyRuleFixerRector::class);
-    $rectorConfig->rule(StringClassNameToClassConstantRector::class);
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
     $rectorConfig->rule(BooleanInIfConditionRuleFixerRector::class);
     $rectorConfig->rule(SingleInArrayToCompareRector::class);
+
+    $rectorConfig
+        ->ruleWithConfiguration(StringClassNameToClassConstantRector::class, [
+            // keep '\\' prefix string on string '\Foo\Bar'
+            StringClassNameToClassConstantRector::SHOULD_KEEP_PRE_SLASH => true,
+        ]);
 };

From 8f32623eb8dd27dfa2f8da8c7424a5c547bb2837 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 16:42:38 +0900
Subject: [PATCH 362/380] docs: use list for readablitily

Co-authored-by: Michal Sniatala <michal@sniatala.pl>
---
 .../source/installation/upgrade_4xx.rst       | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 7eb86b5dcd32..64b42839ed56 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -170,17 +170,14 @@ Error Handling
 
 - The behavior in CI4 has been slightly changed.
 
-  - In CI3, ignored errors by ``error_reporting()`` in **index.php** are not logged,
-    but other errors are logged (but depending on the ``log_threshold`` setting,
-    they may not be written to the log file). Only errors with the error level
-    ``E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR``
-    will stop the framework processing, regardless of the error level set in
-    ``error_reporting()``.
-  - In CI4, only errors with the error level set by ``error_reporting()`` in
-    **app/Config/Boot/{environment}.php** are logged (but depending on the
-    ``Config\Logger::$threshold`` setting, they may not be written to the log file).
-    All errors that are not ignored by ``error_reporting()`` will stop the
-    framework processing.
+  - In CI3 the behavior was set in the **index.php** file:
+      - errors ignored by ``error_reporting()`` was not logged;
+      - other errors were logged (depending on the settings in ``log_threshold``, they may not have been written to the log file);
+      - errors with an error level of ``E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR`` stopped framework processing, regardless of the error level set in ``error_reporting()``;
+  - In CI4, the behavior is set in the **app/Config/Boot/{environment}.php** file:
+      - errors with the error level set by ``error_reporting()`` are logged (but depending on the
+    ``Config\Logger::$threshold`` setting, they may not be written to the log file);
+      - all errors that are not ignored by ``error_reporting()`` will stop the framework processing;
 
 Extending the Framework
 =======================

From 7e35646ad1c4577a15b02a2f58264af6eb3c355b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 16:47:34 +0900
Subject: [PATCH 363/380] docs: fix RST format and improve the description

---
 .../source/installation/upgrade_4xx.rst       | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 64b42839ed56..833e3b3130d7 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -171,13 +171,21 @@ Error Handling
 - The behavior in CI4 has been slightly changed.
 
   - In CI3 the behavior was set in the **index.php** file:
-      - errors ignored by ``error_reporting()`` was not logged;
-      - other errors were logged (depending on the settings in ``log_threshold``, they may not have been written to the log file);
-      - errors with an error level of ``E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR`` stopped framework processing, regardless of the error level set in ``error_reporting()``;
+
+      - errors with the error level set by ``error_reporting()`` are logged (but
+        depending on the ``log_threshold`` setting, they may not be written to
+        the log file).
+      - errors with an error level of
+        ``E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR``
+        stopped framework processing, regardless of the error level set in
+        ``error_reporting()``.
   - In CI4, the behavior is set in the **app/Config/Boot/{environment}.php** file:
-      - errors with the error level set by ``error_reporting()`` are logged (but depending on the
-    ``Config\Logger::$threshold`` setting, they may not be written to the log file);
-      - all errors that are not ignored by ``error_reporting()`` will stop the framework processing;
+
+      - errors with the error level set by ``error_reporting()`` are logged (but
+        depending on the ``Config\Logger::$threshold`` setting, they may not be
+        written to the log file).
+      - all errors that are not ignored by ``error_reporting()`` will stop the
+        framework processing.
 
 Extending the Framework
 =======================

From 5b142ff28f04b56fff4eae6d628c18e813497658 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 17:24:05 +0900
Subject: [PATCH 364/380] docs: fix by proofreading

Co-authored-by: Michal Sniatala <michal@sniatala.pl>
---
 user_guide_src/source/installation/upgrade_4xx.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 833e3b3130d7..8f9770e7fe3d 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -170,7 +170,7 @@ Error Handling
 
 - The behavior in CI4 has been slightly changed.
 
-  - In CI3 the behavior was set in the **index.php** file:
+  - In CI3 the behavior is set in the **index.php** file:
 
       - errors with the error level set by ``error_reporting()`` are logged (but
         depending on the ``log_threshold`` setting, they may not be written to

From 0b8c4fd3f01c1fff46bf47ee7ce8528f8073a0a5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 23 Dec 2023 07:42:46 +0900
Subject: [PATCH 365/380] test: add missing test case

---
 tests/system/View/TableTest.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index f4d7f4056f2d..ee1802b0725a 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -173,7 +173,24 @@ public function testAddRow(): void
         );
     }
 
-    // Uility Methods
+    public function testAddRowAndRowWithAttributes(): void
+    {
+        $cell = ['data' => 'Blue', 'class' => 'highlight', 'colspan' => 2];
+        $this->table->addRow($cell, 'Red', 'Green');
+        // If there is only one column `$this->table->addRow($cell)`,
+        // this test will fail.
+        // See https://github.com/codeigniter4/CodeIgniter4/issues/8361
+
+        $expected = '<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr>
+<td colspan="2" class="highlight">Blue</td><td>Red</td><td>Green</td></tr>
+</tbody>
+</table>';
+        $this->assertSame($expected, $this->table->generate());
+    }
+
+    // Utility Methods
 
     public function testPrepArgs(): void
     {

From 7aa8a787b3084b0fb56985f2c346c0f3c6c07941 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 24 Dec 2023 13:45:26 +0900
Subject: [PATCH 366/380] chore: add code to update version number in
 "phpdoc.dist.xml"

---
 admin/RELEASE.md          |  2 ++
 admin/prepare-release.php | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index 731527de0ed7..8d68ccd9923a 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -90,6 +90,8 @@ Work off direct clones of the repos so the release branches persist for a time.
       and `release = '4.x.x'`
     * Update **user_guide_src/source/changelogs/{version}.rst**
       * Set the date to format `Release Date: January 31, 2021`
+    * Update **phpdoc.dist.xml** with the new `<title>CodeIgniter v4.x API</title>`
+      and `<version number="4.x.x">`
     * Commit the changes with `Prep for 4.x.x release`
 * [ ] Create a new PR from `release-4.x.x` to `develop`:
   * Title: `Prep for 4.x.x release`
diff --git a/admin/prepare-release.php b/admin/prepare-release.php
index 1b173a0f75d6..aebc1ea98c06 100644
--- a/admin/prepare-release.php
+++ b/admin/prepare-release.php
@@ -48,6 +48,18 @@ function replace_file_content(string $path, string $pattern, string $replace): v
     "release = '{$version}'"
 );
 
+// Updates version number in "phpdoc.dist.xml".
+replace_file_content(
+    './phpdoc.dist.xml',
+    '!<title>CodeIgniter v.*? API</title>!mu',
+    "<title>CodeIgniter v{$minor} API</title>"
+);
+replace_file_content(
+    './phpdoc.dist.xml',
+    '/<version number=".*?">/mu',
+    "<version number=\"{$version}\">"
+);
+
 // Updates release date in changelogs.
 $date = date('F j, Y');
 replace_file_content(

From 1354ae78a3e73723a014f45018f7d2c9078cbb1b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Dec 2023 17:45:09 +0900
Subject: [PATCH 367/380] chore: fix php-cs-fixer version to 3.41.*

See https://github.com/codeigniter4/CodeIgniter4/pull/8367#issuecomment-1868853441
---
 admin/framework/composer.json | 2 +-
 composer.json                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 245091e5d256..9d7cba44ddbb 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -20,7 +20,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "3.13.0",
+        "friendsofphp/php-cs-fixer": "~3.41.0",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
diff --git a/composer.json b/composer.json
index b9799247d5aa..f7f98d862c11 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
+        "friendsofphp/php-cs-fixer": "~3.41.0",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",

From cc8155238d0b3b1bc81e3016f6741cb4c05aa5f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Dec 2023 07:17:28 +0900
Subject: [PATCH 368/380] docs: fix PHPDoc types

---
 tests/_support/Entity/Cast/CastBase64.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/_support/Entity/Cast/CastBase64.php b/tests/_support/Entity/Cast/CastBase64.php
index f09fb79d3e8d..2d45793c535e 100644
--- a/tests/_support/Entity/Cast/CastBase64.php
+++ b/tests/_support/Entity/Cast/CastBase64.php
@@ -18,10 +18,8 @@ class CastBase64 extends BaseCast
     /**
      * Get
      *
-     * @param mixed $value  Data
-     * @param array $params Additional param
-     *
-     * @return mixed
+     * @param string $value  Data
+     * @param array  $params Additional param
      */
     public static function get($value, array $params = []): string
     {
@@ -31,10 +29,8 @@ public static function get($value, array $params = []): string
     /**
      * Set
      *
-     * @param mixed $value  Data
-     * @param array $params Additional param
-     *
-     * @return mixed
+     * @param string $value  Data
+     * @param array  $params Additional param
      */
     public static function set($value, array $params = []): string
     {

From d510a42d68453086b0be115925d40ac8867da992 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 16:11:27 +0900
Subject: [PATCH 369/380] refactor: replace empty()

---
 system/API/ResponseTrait.php          |  2 +-
 system/Autoloader/FileLocator.php     |  6 +++---
 system/BaseModel.php                  | 24 +++++++++++++-----------
 system/RESTful/ResourceController.php |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index d5b198ae93fb..3cf0535914c4 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -318,7 +318,7 @@ protected function format($data = null)
 
         // Determine correct response type through content negotiation if not explicitly declared
         if (
-            (empty($this->format) || ! in_array($this->format, ['json', 'xml'], true))
+            ! in_array($this->format, ['json', 'xml'], true)
             && $this->request instanceof IncomingRequest
         ) {
             $mime = $this->request->negotiate(
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 11aa56edc4f7..c5cf8e18d28b 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -67,7 +67,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         $segments = explode('\\', $file);
 
         // The first segment will be empty if a slash started the filename.
-        if (empty($segments[0])) {
+        if ($segments[0] === '') {
             unset($segments[0]);
         }
 
@@ -89,7 +89,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         }
 
         // if no namespaces matched then quit
-        if (empty($paths)) {
+        if ($paths === []) {
             return false;
         }
 
@@ -272,7 +272,7 @@ public function findQualifiedNameFromPath(string $path)
         foreach ($this->getNamespaces() as $namespace) {
             $namespace['path'] = realpath($namespace['path']) ?: $namespace['path'];
 
-            if (empty($namespace['path'])) {
+            if ($namespace['path'] === '') {
                 continue;
             }
 
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 1b669a30d2c2..6a6f0dff4dd2 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -567,7 +567,7 @@ public function find($id = null)
                 'singleton' => $singleton,
             ]);
 
-            if (! empty($eventData['returnData'])) {
+            if (isset($eventData['returnData']) && $eventData['returnData'] === true) {
                 return $eventData['data'];
             }
         }
@@ -629,7 +629,7 @@ public function findAll(int $limit = 0, int $offset = 0)
                 'singleton' => false,
             ]);
 
-            if (! empty($eventData['returnData'])) {
+            if (isset($eventData['returnData']) && $eventData['returnData'] === true) {
                 return $eventData['data'];
             }
         }
@@ -667,7 +667,7 @@ public function first()
                 'singleton' => true,
             ]);
 
-            if (! empty($eventData['returnData'])) {
+            if (isset($eventData['returnData']) && $eventData['returnData'] === true) {
                 return $eventData['data'];
             }
         }
@@ -703,7 +703,7 @@ public function first()
      */
     public function save($row): bool
     {
-        if (empty($row)) {
+        if ((array) $row === []) {
             return true;
         }
 
@@ -729,7 +729,9 @@ public function save($row): bool
      */
     protected function shouldUpdate($row): bool
     {
-        return ! empty($this->getIdValue($row));
+        $id = $this->getIdValue($row);
+
+        return ! ($id === null || $id === []);
     }
 
     /**
@@ -1510,15 +1512,15 @@ public function validate($row): bool
     {
         $rules = $this->getValidationRules();
 
-        if ($this->skipValidation || $rules === [] || empty($row)) {
-            return true;
-        }
-
         // Validation requires array, so cast away.
         if (is_object($row)) {
             $row = (array) $row;
         }
 
+        if ($this->skipValidation || $rules === [] || $row === []) {
+            return true;
+        }
+
         $rules = $this->cleanValidationRules ? $this->cleanValidationRules($rules, $row) : $rules;
 
         // If no data existed that needs validation
@@ -1632,7 +1634,7 @@ public function allowCallbacks(bool $val = true)
     protected function trigger(string $event, array $eventData)
     {
         // Ensure it's a valid event
-        if (! isset($this->{$event}) || empty($this->{$event})) {
+        if (! isset($this->{$event}) || $this->{$event} === []) {
             return $eventData;
         }
 
@@ -1772,7 +1774,7 @@ protected function transformDataToArray($row, string $type): array
             throw new InvalidArgumentException(sprintf('Invalid type "%s" used upon transforming data to array.', $type));
         }
 
-        if (! $this->allowEmptyInserts && empty($row)) {
+        if (! $this->allowEmptyInserts && ($row === null || (array) $row === [])) {
             throw DataException::forEmptyDataset($type);
         }
 
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
index 03ba4d314613..6ffb602c8bd1 100644
--- a/system/RESTful/ResourceController.php
+++ b/system/RESTful/ResourceController.php
@@ -105,6 +105,7 @@ public function delete($id = null)
      * Set/change the expected response representation for returned objects
      *
      * @param string $format json/xml
+     * @phpstan-param 'json'|'xml' $format
      *
      * @return void
      */

From d7587744c02f2bcc2acb8aa3ff825ed2dd3fbaa7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 16:38:53 +0900
Subject: [PATCH 370/380] refactor: replace empty()

---
 app/Config/Kint.php    |  6 +++---
 system/CodeIgniter.php | 16 ++++++++--------
 system/View/Table.php  | 14 +++++++-------
 system/View/View.php   |  8 ++++----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/Config/Kint.php b/app/Config/Kint.php
index 77aeb08f1432..117e66d87c45 100644
--- a/app/Config/Kint.php
+++ b/app/Config/Kint.php
@@ -27,7 +27,7 @@ class Kint extends BaseConfig
     */
 
     /**
-     * @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>
+     * @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>|null
      */
     public $plugins;
 
@@ -45,12 +45,12 @@ class Kint extends BaseConfig
     public int $richSort     = AbstractRenderer::SORT_FULL;
 
     /**
-     * @var array<string, class-string<ValuePluginInterface>>
+     * @var array<string, class-string<ValuePluginInterface>>|null
      */
     public $richObjectPlugins;
 
     /**
-     * @var array<string, class-string<TabPluginInterface>>
+     * @var array<string, class-string<TabPluginInterface>>|null
      */
     public $richTabPlugins;
 
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 8299bfafa992..1dcf55d2fbe6 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -108,7 +108,7 @@ class CodeIgniter
     /**
      * Controller to use.
      *
-     * @var (Closure(mixed...): ResponseInterface|string)|string
+     * @var (Closure(mixed...): ResponseInterface|string)|string|null
      */
     protected $controller;
 
@@ -138,7 +138,7 @@ class CodeIgniter
     /**
      * Request path to use.
      *
-     * @var string
+     * @var string|null
      *
      * @deprecated No longer used.
      */
@@ -302,7 +302,7 @@ private function configureKint(): void
         Kint::$display_called_from = $config->displayCalledFrom;
         Kint::$expanded            = $config->expanded;
 
-        if (! empty($config->plugins) && is_array($config->plugins)) {
+        if (isset($config->plugins) && is_array($config->plugins)) {
             Kint::$plugins = $config->plugins;
         }
 
@@ -315,10 +315,10 @@ private function configureKint(): void
         RichRenderer::$theme  = $config->richTheme;
         RichRenderer::$folder = $config->richFolder;
         RichRenderer::$sort   = $config->richSort;
-        if (! empty($config->richObjectPlugins) && is_array($config->richObjectPlugins)) {
+        if (isset($config->richObjectPlugins) && is_array($config->richObjectPlugins)) {
             RichRenderer::$value_plugins = $config->richObjectPlugins;
         }
-        if (! empty($config->richTabPlugins) && is_array($config->richTabPlugins)) {
+        if (isset($config->richTabPlugins) && is_array($config->richTabPlugins)) {
             RichRenderer::$tab_plugins = $config->richTabPlugins;
         }
 
@@ -848,7 +848,7 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
      */
     protected function determinePath()
     {
-        if (! empty($this->path)) {
+        if (isset($this->path)) {
             return $this->path;
         }
 
@@ -892,7 +892,7 @@ protected function startController()
         }
 
         // No controller specified - we don't know what to do now.
-        if (empty($this->controller)) {
+        if (! isset($this->controller)) {
             throw PageNotFoundException::forEmptyController();
         }
 
@@ -1091,7 +1091,7 @@ public function spoofRequestMethod()
 
         $method = $this->request->getPost('_method');
 
-        if (empty($method)) {
+        if ($method === null) {
             return;
         }
 
diff --git a/system/View/Table.php b/system/View/Table.php
index 9a259c8beafa..0cab38fb4f39 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -217,7 +217,7 @@ public function addRow()
     {
         $tmpRow = $this->_prepArgs(func_get_args());
 
-        if ($this->syncRowsWithHeading && ! empty($this->heading)) {
+        if ($this->syncRowsWithHeading && $this->heading !== []) {
             // each key has an index
             $keyIndex = array_flip(array_keys($this->heading));
 
@@ -303,7 +303,7 @@ public function generate($tableData = null)
     {
         // The table data can optionally be passed to this function
         // either as a database result object or an array
-        if (! empty($tableData)) {
+        if ($tableData !== null && $tableData !== []) {
             if ($tableData instanceof BaseResult) {
                 $this->_setFromDBResult($tableData);
             } elseif (is_array($tableData)) {
@@ -312,7 +312,7 @@ public function generate($tableData = null)
         }
 
         // Is there anything to display? No? Smite them!
-        if (empty($this->heading) && $this->rows === []) {
+        if ($this->heading === [] && $this->rows === []) {
             return 'Undefined table data';
         }
 
@@ -333,7 +333,7 @@ public function generate($tableData = null)
         }
 
         // Is there a table heading to display?
-        if (! empty($this->heading)) {
+        if ($this->heading !== []) {
             $headerTag = null;
 
             if (preg_match('/(<)(td|th)(?=\h|>)/i', $this->template['heading_cell_start'], $matches) === 1) {
@@ -399,7 +399,7 @@ public function generate($tableData = null)
         }
 
         // Any table footing to display?
-        if (! empty($this->footing)) {
+        if ($this->footing !== []) {
             $footerTag = null;
 
             if (preg_match('/(<)(td|th)(?=\h|>)/i', $this->template['footing_cell_start'], $matches)) {
@@ -458,7 +458,7 @@ public function clear()
     protected function _setFromDBResult($object)
     {
         // First generate the headings from the table column names
-        if ($this->autoHeading && empty($this->heading)) {
+        if ($this->autoHeading && $this->heading === []) {
             $this->heading = $this->_prepArgs($object->getFieldNames());
         }
 
@@ -476,7 +476,7 @@ protected function _setFromDBResult($object)
      */
     protected function _setFromArray($data)
     {
-        if ($this->autoHeading && empty($this->heading)) {
+        if ($this->autoHeading && $this->heading === []) {
             $this->heading = $this->_prepArgs(array_shift($data));
         }
 
diff --git a/system/View/View.php b/system/View/View.php
index 9d84e969da5b..2e2823fa2332 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -178,7 +178,7 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
 
         $fileExt = pathinfo($view, PATHINFO_EXTENSION);
         // allow Views as .html, .tpl, etc (from CI3)
-        $this->renderVars['view'] = empty($fileExt) ? $view . '.php' : $view;
+        $this->renderVars['view'] = ($fileExt === '') ? $view . '.php' : $view;
 
         $this->renderVars['options'] = $options ?? [];
 
@@ -207,12 +207,12 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
             $this->renderVars['file'] = $this->loader->locateFile(
                 $this->renderVars['view'],
                 'Views',
-                empty($fileExt) ? 'php' : $fileExt
+                ($fileExt === '') ? 'php' : $fileExt
             );
         }
 
-        // locateFile will return an empty string if the file cannot be found.
-        if (empty($this->renderVars['file'])) {
+        // locateFile() will return false if the file cannot be found.
+        if ($this->renderVars['file'] === false) {
             throw ViewException::forInvalidFile($this->renderVars['view']);
         }
 

From 31c5c141b97e0ac1c744f9675f0648ba4324684f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 17:32:15 +0900
Subject: [PATCH 371/380] refactor: replace empty()

---
 system/CodeIgniter.php                  |  9 ++++-----
 system/Validation/StrictRules/Rules.php |  6 ++++--
 system/Validation/Validation.php        |  6 +++---
 system/Validation/Views/list.php        |  2 +-
 system/View/Filters.php                 |  2 +-
 system/View/Parser.php                  | 10 +++++-----
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 1dcf55d2fbe6..39a3029f3954 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -848,11 +848,10 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
      */
     protected function determinePath()
     {
-        if (isset($this->path)) {
-            return $this->path;
-        }
-
-        return method_exists($this->request, 'getPath') ? $this->request->getPath() : $this->request->getUri()->getPath();
+        return $this->path ??
+            (method_exists($this->request, 'getPath')
+                ? $this->request->getPath()
+                : $this->request->getUri()->getPath());
     }
 
     /**
diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index 70d081975a62..3086ca5a1d95 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/system/Validation/StrictRules/Rules.php
@@ -157,7 +157,8 @@ public function is_not_unique($str, string $field, array $data): bool
             ->limit(1);
 
         if (
-            ! empty($whereField) && ! empty($whereValue)
+            $whereField !== null && $whereField !== ''
+            && $whereValue !== null && $whereValue !== ''
             && ! preg_match('/^\{(\w+)\}$/', $whereValue)
         ) {
             $row = $row->where($whereField, $whereValue);
@@ -216,7 +217,8 @@ public function is_unique($str, string $field, array $data): bool
             ->limit(1);
 
         if (
-            ! empty($ignoreField) && ! empty($ignoreValue)
+            $ignoreField !== null && $ignoreField !== ''
+            && $ignoreValue !== null && $ignoreValue !== ''
             && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
         ) {
             $row = $row->where("{$ignoreField} !=", $ignoreValue);
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 6e71aadb23f3..83bb361e7017 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -148,7 +148,7 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
 
         // If no rules exist, we return false to ensure
         // the developer didn't forget to set the rules.
-        if (empty($this->rules)) {
+        if ($this->rules === []) {
             return false;
         }
 
@@ -707,7 +707,7 @@ public function showError(string $field, string $template = 'single'): string
      */
     protected function loadRuleSets()
     {
-        if (empty($this->ruleSetFiles)) {
+        if ($this->ruleSetFiles === [] || $this->ruleSetFiles === null) {
             throw ValidationException::forNoRuleSets();
         }
 
@@ -918,7 +918,7 @@ protected function getErrorMessage(
         $message = str_replace('{field}', ($label === null || $label === '') ? $field : lang($label), $message);
         $message = str_replace(
             '{param}',
-            empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']),
+            (! isset($this->rules[$param]['label'])) ? $param : lang($this->rules[$param]['label']),
             $message
         );
 
diff --git a/system/Validation/Views/list.php b/system/Validation/Views/list.php
index cc95156cd5c4..3669f038e806 100644
--- a/system/Validation/Views/list.php
+++ b/system/Validation/Views/list.php
@@ -1,4 +1,4 @@
-<?php if (! empty($errors)) : ?>
+<?php if (isset($errors) && $errors !== []) : ?>
 	<div class="errors" role="alert">
 		<ul>
 		<?php foreach ($errors as $error) : ?>
diff --git a/system/View/Filters.php b/system/View/Filters.php
index 65dfe6dff943..fa03a1919a2b 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -66,7 +66,7 @@ public static function date_modify($value, string $adjustment)
      */
     public static function default($value, string $default): string
     {
-        return empty($value)
+        return empty($value) // @phpstan-ignore-line
             ? $default
             : $value;
     }
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 8410ef969fca..87f0e96bdce9 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -103,7 +103,7 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         }
 
         $fileExt = pathinfo($view, PATHINFO_EXTENSION);
-        $view    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
+        $view    = ($fileExt === '') ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
 
         $cacheName = $options['cache_name'] ?? str_replace('.php', '', $view);
 
@@ -120,8 +120,8 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
             $fileOrig = $file;
             $file     = $this->loader->locateFile($view, 'Views');
 
-            // locateFile will return an empty string if the file cannot be found.
-            if (empty($file)) {
+            // locateFile() will return false if the file cannot be found.
+            if ($file === false) {
                 throw ViewException::forInvalidFile($fileOrig);
             }
         }
@@ -534,7 +534,7 @@ protected function prepareReplacement(array $matches, string $replace, bool $esc
 
         // Our regex earlier will leave all chained values on a single line
         // so we need to break them apart so we can apply them all.
-        $filters = ! empty($matches[1]) ? explode('|', $matches[1]) : [];
+        $filters = (isset($matches[1]) && $matches[1] !== '') ? explode('|', $matches[1]) : [];
 
         if ($escape && $filters === [] && ($context = $this->shouldAddEscaping($orig))) {
             $filters[] = "esc({$context})";
@@ -589,7 +589,7 @@ protected function applyFilters(string $replace, array $filters): string
             preg_match('/\([\w<>=\/\\\,:.\-\s\+]+\)/u', $filter, $param);
 
             // Remove the () and spaces to we have just the parameter left
-            $param = ! empty($param) ? trim($param[0], '() ') : null;
+            $param = ($param !== []) ? trim($param[0], '() ') : null;
 
             // Params can be separated by commas to allow multiple parameters for the filter
             if ($param !== null && $param !== '') {

From 0ece99be51d26051b16bab93aba218c5dc74a323 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Dec 2023 13:31:49 +0900
Subject: [PATCH 372/380] refactor: replace empty()

---
 system/Test/CIUnitTestCase.php        |  2 +-
 system/Test/DatabaseTestTrait.php     |  8 ++++----
 system/Test/TestResponse.php          |  4 +++-
 system/Validation/CreditCardRules.php |  2 +-
 system/Validation/Rules.php           | 17 +++++++++++------
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 4e889b5ea1d0..b27db73f229e 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -123,7 +123,7 @@ abstract class CIUnitTestCase extends TestCase
 
     /**
      * The namespace(s) to help us find the migration classes.
-     * Empty is equivalent to running `spark migrate --all`.
+     * `null` is equivalent to running `spark migrate --all`.
      * Note that running "all" runs migrations in date order,
      * but specifying namespaces runs them in namespace order (then date)
      *
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index d7b8b02ddaa8..f69a535f41ec 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -120,7 +120,7 @@ protected function regressDatabase()
         }
 
         // If no namespace was specified then rollback all
-        if (empty($this->namespace)) {
+        if ($this->namespace === null) {
             $this->migrations->setNamespace(null);
             $this->migrations->regress(0, 'tests');
         }
@@ -146,7 +146,7 @@ protected function migrateDatabase()
         }
 
         // If no namespace was specified then migrate all
-        if (empty($this->namespace)) {
+        if ($this->namespace === null) {
             $this->migrations->setNamespace(null);
             $this->migrations->latest('tests');
             self::$doneMigration = true;
@@ -182,8 +182,8 @@ protected function setUpSeed()
      */
     protected function runSeeds()
     {
-        if (! empty($this->seed)) {
-            if (! empty($this->basePath)) {
+        if ($this->seed !== '') {
+            if ($this->basePath !== '') {
                 $this->seeder->setPath(rtrim($this->basePath, '/') . '/Seeds');
             }
 
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 956b32188ac8..215942d54fe9 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -136,8 +136,10 @@ public function isOK(): bool
             return false;
         }
 
+        $body = (string) $this->response->getBody();
+
         // Empty bodies are not considered valid, unless in redirects
-        return ! ($status < 300 && empty($this->response->getBody()));
+        return ! ($status < 300 && $body === '');
     }
 
     /**
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 61f59d7bfe86..8e17b75d375f 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -185,7 +185,7 @@ public function valid_cc_number(?string $ccNumber, string $type): bool
         }
 
         // If empty, it's not a card type we recognize, or invalid type.
-        if (empty($info)) {
+        if ($info === null) {
             return false;
         }
 
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 6481a45b4e00..7a051f902ed8 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -105,7 +105,8 @@ public function is_not_unique(?string $str, string $field, array $data): bool
             ->limit(1);
 
         if (
-            ! empty($whereField) && ! empty($whereValue)
+            $whereField !== null && $whereField !== ''
+            && $whereValue !== null && $whereValue !== ''
             && ! preg_match('/^\{(\w+)\}$/', $whereValue)
         ) {
             $row = $row->where($whereField, $whereValue);
@@ -150,7 +151,8 @@ public function is_unique(?string $str, string $field, array $data): bool
             ->limit(1);
 
         if (
-            ! empty($ignoreField) && ! empty($ignoreValue)
+            $ignoreField !== null && $ignoreField !== ''
+            && $ignoreValue !== null && $ignoreValue !== ''
             && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
         ) {
             $row = $row->where("{$ignoreField} !=", $ignoreValue);
@@ -276,8 +278,10 @@ public function required_with($str = null, ?string $fields = null, array $data =
 
         foreach (explode(',', $fields) as $field) {
             if (
-                (array_key_exists($field, $data) && ! empty($data[$field]))
-                || (strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))
+                (array_key_exists($field, $data)
+                    && ! empty($data[$field]))  // @phpstan-ignore-line Use empty()
+                || (strpos($field, '.') !== false
+                    && ! empty(dot_array_search($field, $data)))  // @phpstan-ignore-line Use empty()
             ) {
                 $requiredFields[] = $field;
             }
@@ -323,7 +327,8 @@ public function required_without(
         foreach (explode(',', $otherFields) as $otherField) {
             if (
                 (strpos($otherField, '.') === false)
-                && (! array_key_exists($otherField, $data) || empty($data[$otherField]))
+                && (! array_key_exists($otherField, $data)
+                    || empty($data[$otherField])) // @phpstan-ignore-line Use empty()
             ) {
                 return false;
             }
@@ -338,7 +343,7 @@ public function required_without(
                 $fieldKey        = $fieldSplitArray[1];
 
                 if (is_array($fieldData)) {
-                    return ! empty(dot_array_search($otherField, $data)[$fieldKey]);
+                    return ! empty(dot_array_search($otherField, $data)[$fieldKey]);  // @phpstan-ignore-line Use empty()
                 }
                 $nowField      = str_replace('*', $fieldKey, $otherField);
                 $nowFieldVaule = dot_array_search($nowField, $data);

From 8d17de2968d5517fdd0397a37a2b557958e8f3dc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Dec 2023 14:06:29 +0900
Subject: [PATCH 373/380] chore: add --exclude for phpcpd

---
 .github/workflows/test-phpcpd.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index 53daa8ebab95..04ef53bb99c5 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -56,4 +56,5 @@ jobs:
             --exclude system/Database/Postgre/Builder.php
             --exclude system/Debug/Exceptions.php
             --exclude system/HTTP/SiteURI.php
+            --exclude system/Validation/Rules.php
             -- app/ public/ system/

From 424444fca7c325f6744d9617aeed58c0ab3a3a55 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Dec 2023 16:11:47 +0900
Subject: [PATCH 374/380] chore: remove ignoreErrors

---
 phpstan-baseline.php | 92 +-------------------------------------------
 1 file changed, 1 insertion(+), 91 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 65a22b8f584a..623405705e6c 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -16,11 +16,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/Autoloader/FileLocator.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, int\\|string given\\.$#',
 	'count' => 1,
@@ -31,11 +26,6 @@
 	'count' => 6,
 	'path' => __DIR__ . '/system/Autoloader/FileLocator.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
-	'path' => __DIR__ . '/system/BaseModel.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#',
 	'count' => 1,
@@ -161,11 +151,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
-	'path' => __DIR__ . '/system/CodeIgniter.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -1721,16 +1706,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/ExceptionHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/Exceptions.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 5,
@@ -2546,11 +2521,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/RESTful/BaseResource.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/RESTful/ResourceController.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#',
 	'count' => 1,
@@ -3041,11 +3011,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Session/SessionInterface.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
-	'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -3213,7 +3178,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
+	'count' => 1,
 	'path' => __DIR__ . '/system/Test/FeatureTestCase.php',
 ];
 $ignoreErrors[] = [
@@ -3496,11 +3461,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getFormat\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -3621,11 +3581,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/TestLogger.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/TestResponse.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:__call\\(\\) should return mixed but return statement is missing\\.$#',
 	'count' => 1,
@@ -3741,31 +3696,11 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Throttle/Throttler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Validation/CreditCardRules.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a negated boolean, array\\|null given\\.$#',
 	'count' => 6,
 	'path' => __DIR__ . '/system/Validation/FileRules.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 8,
-	'path' => __DIR__ . '/system/Validation/Rules.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
-	'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/Validation/Validation.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:isClosure\\(\\) has parameter \\$rule with no signature specified for Closure\\.$#',
 	'count' => 1,
@@ -3776,36 +3711,16 @@
 	'count' => 2,
 	'path' => __DIR__ . '/system/Validation/Validation.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Validation/Views/list.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Call to an undefined static method CodeIgniter\\\\Config\\\\Factories\\:\\:cells\\(\\)\\.$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/View/Cell.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/View/Filters.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 4,
-	'path' => __DIR__ . '/system/View/Parser.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:addPlugin\\(\\) has parameter \\$callback with no signature specified for callable\\.$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/View/Parser.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 7,
-	'path' => __DIR__ . '/system/View/Table.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in a ternary operator condition, float given\\.$#',
 	'count' => 1,
@@ -3821,11 +3736,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/View/Table.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/View/View.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#',
 	'count' => 2,

From 8254eb753dcaa2c3555e0022927fc2335f85a766 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 09:15:25 +0900
Subject: [PATCH 375/380] refactor: replace empty()

---
 system/Test/Fabricator.php          | 10 +++++-----
 system/Test/FeatureTestCase.php     |  2 +-
 system/Test/Mock/MockCache.php      | 10 +++++-----
 system/Test/Mock/MockConnection.php |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 3a28f281d127..c247b8741b01 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -128,7 +128,7 @@ public function __construct($model, ?array $formatters = null, ?string $locale =
 
         // Determine eligible date fields
         foreach (['createdField', 'updatedField', 'deletedField'] as $field) {
-            if (! empty($this->model->{$field})) {
+            if (isset($this->model->{$field})) {
                 $this->dateFields[] = $this->model->{$field};
             }
         }
@@ -152,7 +152,7 @@ public static function resetCounts()
      */
     public static function getCount(string $table): int
     {
-        return empty(self::$tableCounts[$table]) ? 0 : self::$tableCounts[$table];
+        return ! isset(self::$tableCounts[$table]) ? 0 : self::$tableCounts[$table];
     }
 
     /**
@@ -282,7 +282,7 @@ protected function detectFormatters(): self
     {
         $this->formatters = [];
 
-        if (! empty($this->model->allowedFields)) {
+        if (isset($this->model->allowedFields)) {
             foreach ($this->model->allowedFields as $field) {
                 $this->formatters[$field] = $this->guessFormatter($field);
             }
@@ -513,12 +513,12 @@ protected function createMock(?int $count = null)
         // Determine which fields we will need
         $fields = [];
 
-        if (! empty($this->model->useTimestamps)) {
+        if ($this->model->useTimestamps) {
             $fields[$this->model->createdField] = $datetime;
             $fields[$this->model->updatedField] = $datetime;
         }
 
-        if (! empty($this->model->useSoftDeletes)) {
+        if ($this->model->useSoftDeletes) {
             $fields[$this->model->deletedField] = null;
         }
 
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 5c74e27a774d..fff624a840f3 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -186,7 +186,7 @@ public function call(string $method, string $path, ?array $params = null)
             ->run($routes, true);
 
         $output = \ob_get_contents();
-        if (empty($response->getBody()) && ! ($output === '' || $output === false)) {
+        if (($response->getBody() === null) && ! ($output === '' || $output === false)) {
             $response->setBody($output);
         }
 
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index 73a755802285..082807b559ec 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -22,7 +22,7 @@ class MockCache extends BaseHandler implements CacheInterface
     /**
      * Mock cache storage.
      *
-     * @var array
+     * @var array<string, mixed>
      */
     protected $cache = [];
 
@@ -155,7 +155,7 @@ public function increment(string $key, int $offset = 1)
         $key  = static::validateKey($key, $this->prefix);
         $data = $this->cache[$key] ?: null;
 
-        if (empty($data)) {
+        if ($data === null) {
             $data = 0;
         } elseif (! is_int($data)) {
             return false;
@@ -175,7 +175,7 @@ public function decrement(string $key, int $offset = 1)
 
         $data = $this->cache[$key] ?: null;
 
-        if (empty($data)) {
+        if ($data === null) {
             $data = 0;
         } elseif (! is_int($data)) {
             return false;
@@ -281,9 +281,9 @@ public function assertHasValue(string $key, $value = null)
     {
         $item = $this->get($key);
 
-        // Let assertHas handle throwing the error for consistency
+        // Let assertHas() handle throwing the error for consistency
         // if the key is not found
-        if (empty($item)) {
+        if ($item === null) {
             $this->assertHas($key);
         }
 
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index ea4ebac9b471..2e9ebe3b527a 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -62,7 +62,7 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, s
 
         $query->setQuery($sql, $binds, $setEscapeFlags);
 
-        if (! empty($this->swapPre) && ! empty($this->DBPrefix)) {
+        if ($this->swapPre !== '' && $this->DBPrefix !== '') {
             $query->swapPrefix($this->DBPrefix, $this->swapPre);
         }
 

From 479b35d698a6353cb7e52f5bbfed60a7461b92ff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 09:15:54 +0900
Subject: [PATCH 376/380] chore: remove ignoreErrors

---
 phpstan-baseline.php | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 623405705e6c..c4abb2ef337d 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -3136,26 +3136,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/DOMParser.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Access to an undefined property object\\:\\:\\$createdField\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/Fabricator.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Access to an undefined property object\\:\\:\\$deletedField\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/Fabricator.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Access to an undefined property object\\:\\:\\$updatedField\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/Fabricator.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 5,
-	'path' => __DIR__ . '/system/Test/Fabricator.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:resetCounts\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -3176,11 +3156,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/FeatureTestCase.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/FeatureTestCase.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -3306,11 +3281,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 3,
-	'path' => __DIR__ . '/system/Test/Mock/MockCache.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:assertHas\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -3346,11 +3316,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/Mock/MockConnection.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Test/Mock/MockConnection.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#',
 	'count' => 1,

From 69fbb6c853d246d722fad0d9ba96a8542bd5631c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 11:07:21 +0900
Subject: [PATCH 377/380] refactor: replace empty()

---
 system/Model.php           | 26 +++++++++++++-------------
 system/Session/Session.php | 18 +++++++++---------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/system/Model.php b/system/Model.php
index d264107fc4dc..5dba810c8c59 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -257,13 +257,13 @@ protected function doFirst()
 
         if ($this->tempUseSoftDeletes) {
             $builder->where($this->table . '.' . $this->deletedField, null);
-        } elseif ($this->useSoftDeletes && empty($builder->QBGroupBy) && $this->primaryKey) {
+        } elseif ($this->useSoftDeletes && ($builder->QBGroupBy === []) && $this->primaryKey) {
             $builder->groupBy($this->table . '.' . $this->primaryKey);
         }
 
         // Some databases, like PostgreSQL, need order
         // information to consistently return correct results.
-        if ($builder->QBGroupBy && empty($builder->QBOrderBy) && $this->primaryKey) {
+        if ($builder->QBGroupBy && ($builder->QBOrderBy === []) && $this->primaryKey) {
             $builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');
         }
 
@@ -286,7 +286,7 @@ protected function doInsert(array $row)
 
         // Require non-empty primaryKey when
         // not using auto-increment feature
-        if (! $this->useAutoIncrement && empty($row[$this->primaryKey])) {
+        if (! $this->useAutoIncrement && ! isset($row[$this->primaryKey])) {
             throw DataException::forEmptyPrimaryKey('insert');
         }
 
@@ -351,7 +351,7 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
             foreach ($set as $row) {
                 // Require non-empty primaryKey when
                 // not using auto-increment feature
-                if (! $this->useAutoIncrement && empty($row[$this->primaryKey])) {
+                if (! $this->useAutoIncrement && ! isset($row[$this->primaryKey])) {
                     throw DataException::forEmptyPrimaryKey('insertBatch');
                 }
             }
@@ -433,7 +433,7 @@ protected function doDelete($id = null, bool $purge = false)
         }
 
         if ($this->useSoftDeletes && ! $purge) {
-            if (empty($builder->getCompiledQBWhere())) {
+            if ($builder->getCompiledQBWhere() === []) {
                 throw new DatabaseException(
                     'Deletes are not allowed unless they contain a "where" or "like" clause.'
                 );
@@ -557,7 +557,7 @@ public function getIdValue($row)
             return $row->{$this->primaryKey};
         }
 
-        if (is_array($row) && ! empty($row[$this->primaryKey])) {
+        if (is_array($row) && isset($row[$this->primaryKey])) {
             return $row[$this->primaryKey];
         }
 
@@ -591,7 +591,7 @@ public function chunk(int $size, Closure $userFunc)
 
             $offset += $size;
 
-            if (empty($rows)) {
+            if ($rows === []) {
                 continue;
             }
 
@@ -648,7 +648,7 @@ public function builder(?string $table = null)
         // We're going to force a primary key to exist
         // so we don't have overly convoluted code,
         // and future features are likely to require them.
-        if (empty($this->primaryKey)) {
+        if ($this->primaryKey === '') {
             throw ModelException::forNoPrimaryKey(static::class);
         }
 
@@ -729,8 +729,8 @@ protected function shouldUpdate($row): bool
      */
     public function insert($row = null, bool $returnID = true)
     {
-        if (! empty($this->tempData['data'])) {
-            if (empty($row)) {
+        if (isset($this->tempData['data'])) {
+            if ($row === null) {
                 $row = $this->tempData['data'];
             } else {
                 $row = $this->transformDataToArray($row, 'insert');
@@ -792,8 +792,8 @@ protected function doProtectFieldsForInsert(array $row): array
      */
     public function update($id = null, $row = null): bool
     {
-        if (! empty($this->tempData['data'])) {
-            if (empty($row)) {
+        if (isset($this->tempData['data'])) {
+            if ($row === null) {
                 $row = $this->tempData['data'];
             } else {
                 $row = $this->transformDataToArray($row, 'update');
@@ -910,7 +910,7 @@ public static function classToArray($data, $primaryKey = null, string $dateForma
             $properties = $data->toRawArray($onlyChanged);
 
             // Always grab the primary key otherwise updates will fail.
-            if (! empty($properties) && ! empty($primaryKey) && ! in_array($primaryKey, $properties, true) && ! empty($data->{$primaryKey})) {
+            if ($properties !== [] && isset($primaryKey) && ! in_array($primaryKey, $properties, true) && isset($data->{$primaryKey})) {
                 $properties[$primaryKey] = $data->{$primaryKey};
             }
         } else {
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 7dfe5898d78f..5c087579a2e4 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -241,7 +241,7 @@ public function start()
         $this->startSession();
 
         // Is session ID auto-regeneration configured? (ignoring ajax requests)
-        if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
+        if ((! isset($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
             && ($regenerateTime = $this->config->timeToUpdate) > 0
         ) {
             if (! isset($_SESSION['__ci_last_regenerate'])) {
@@ -368,7 +368,7 @@ protected function configureSidLength()
      */
     protected function initVars()
     {
-        if (empty($_SESSION['__ci_vars'])) {
+        if (! isset($_SESSION['__ci_vars'])) {
             return;
         }
 
@@ -384,7 +384,7 @@ protected function initVars()
             }
         }
 
-        if (empty($_SESSION['__ci_vars'])) {
+        if ($_SESSION['__ci_vars'] === []) {
             unset($_SESSION['__ci_vars']);
         }
     }
@@ -646,7 +646,7 @@ public function getFlashdata(?string $key = null)
 
         $flashdata = [];
 
-        if (! empty($_SESSION['__ci_vars'])) {
+        if (isset($_SESSION['__ci_vars'])) {
             foreach ($_SESSION['__ci_vars'] as $key => &$value) {
                 if (! is_int($value)) {
                     $flashdata[$key] = $_SESSION[$key];
@@ -706,7 +706,7 @@ public function markAsFlashdata($key): bool
      */
     public function unmarkFlashdata($key)
     {
-        if (empty($_SESSION['__ci_vars'])) {
+        if (! isset($_SESSION['__ci_vars'])) {
             return;
         }
 
@@ -720,7 +720,7 @@ public function unmarkFlashdata($key)
             }
         }
 
-        if (empty($_SESSION['__ci_vars'])) {
+        if ($_SESSION['__ci_vars'] === []) {
             unset($_SESSION['__ci_vars']);
         }
     }
@@ -778,7 +778,7 @@ public function getTempdata(?string $key = null)
 
         $tempdata = [];
 
-        if (! empty($_SESSION['__ci_vars'])) {
+        if (isset($_SESSION['__ci_vars'])) {
             foreach ($_SESSION['__ci_vars'] as $key => &$value) {
                 if (is_int($value)) {
                     $tempdata[$key] = $_SESSION[$key];
@@ -856,7 +856,7 @@ public function markAsTempdata($key, int $ttl = 300): bool
      */
     public function unmarkTempdata($key)
     {
-        if (empty($_SESSION['__ci_vars'])) {
+        if (! isset($_SESSION['__ci_vars'])) {
             return;
         }
 
@@ -870,7 +870,7 @@ public function unmarkTempdata($key)
             }
         }
 
-        if (empty($_SESSION['__ci_vars'])) {
+        if ($_SESSION['__ci_vars'] === []) {
             unset($_SESSION['__ci_vars']);
         }
     }

From 269986e2fbbe0e24d7efdf19a6ac2f2b9a2da125 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Dec 2023 11:07:39 +0900
Subject: [PATCH 378/380] chore: remove ignoreErrors

---
 phpstan-baseline.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index c4abb2ef337d..1d32322ab5d4 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -2441,11 +2441,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Log/Logger.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 15,
-	'path' => __DIR__ . '/system/Model.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Model\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#',
 	'count' => 1,
@@ -2856,11 +2851,6 @@
 	'count' => 2,
 	'path' => __DIR__ . '/system/Session/Session.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 9,
-	'path' => __DIR__ . '/system/Session/Session.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:configure\\(\\) has no return type specified\\.$#',
 	'count' => 1,

From dda4cc93b0f5c1849acf013532c7270fe18370e1 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Wed, 27 Dec 2023 23:07:10 -0600
Subject: [PATCH 379/380] docs: update official packages page

---
 .../source/libraries/official_packages.rst    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/official_packages.rst b/user_guide_src/source/libraries/official_packages.rst
index b1ac417fe2cb..6da2f41fd2b7 100644
--- a/user_guide_src/source/libraries/official_packages.rst
+++ b/user_guide_src/source/libraries/official_packages.rst
@@ -17,7 +17,7 @@ additional functionality that not every site will need or want.
 Shield
 ******
 
-`CodeIgniter Shield <https://codeigniter4.github.io/shield/>`_ is an authentication
+`CodeIgniter Shield <https://shield.codeigniter.com/>`_ is an authentication
 and authorization framework for CodeIgniter 4. It is designed to be secure, flexible,
 and easily extendable to meet the needs of many different types of websites.
 Among the many features, it includes:
@@ -33,12 +33,27 @@ Among the many features, it includes:
 Settings
 ********
 
-`CodeIgniter Settings <https://github.com/codeigniter4/settings>`_ is a wrapper around
+`CodeIgniter Settings <https://settings.codeigniter.com>`_ is a wrapper around
 the configuration files that allows any configuration setting to saved to the database,
 while defaulting to the config files when not custom value has been stored. This allows
 an application to ship with the default config values, but adapt as the project grows
 or moves servers, without having to touch the code.
 
+************
+Tasks (BETA)
+************
+
+`CodeIgniter Tasks <https://tasks.codeigniter.com>`_ is a simple task scheduler
+for CodeIgniter 4. It allows you to schedule tasks to run at specific times, or
+on a recurring basis. It is designed to be simple to use, but flexible enough to
+handle most use cases.
+
+************
+Queue (BETA)
+************
+
+`CodeIgniter Queue <https://queue.codeigniter.com>`_ is a simple queue system
+for CodeIgniter 4. It allows you to queue up tasks to be run later.
 
 *****
 Cache

From c5e72668326265faf74e58f2a3ee6794720b23ed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Dec 2023 17:27:17 +0900
Subject: [PATCH 380/380] Prep for 4.4.4 release

---
 CHANGELOG.md                                  | 56 ++++++++++++++++++-
 phpdoc.dist.xml                               |  4 +-
 system/CodeIgniter.php                        |  2 +-
 user_guide_src/source/changelogs/v4.4.4.rst   | 11 ++--
 user_guide_src/source/conf.py                 |  2 +-
 .../source/installation/upgrade_444.rst       | 32 +++++------
 6 files changed, 80 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cf10b0f8372..61b773f58ac4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,59 @@
 # Changelog
 
+## [v4.4.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.4) (2023-12-28)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.3...v4.4.4)
+
+### Breaking Changes
+
+* fix: Validation rule with `*` gets incorrect values as dot array syntax by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8129
+* fix: validation rule `matches` and `differs` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8122
+* fix: [CURLRequest] skip hostname checks if options 'verify' false by @NicolaeIotu in https://github.com/codeigniter4/CodeIgniter4/pull/8258
+* fix: get_filenames() does not follow symlinks by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8298
+
+### Fixed Bugs
+
+* fix: change make:command default $group to `App` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8109
+* fix: typo in help message in `spark filter:check` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8118
+* fix: Hot reloading when session is enabled by @michalsn in https://github.com/codeigniter4/CodeIgniter4/pull/8112
+* fix: make:cell help message by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8133
+* fix: [DebugBar] dark mode timeline "Controller" by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8125
+* fix: PHPDoc types in controller.tpl.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8144
+* fix: `@return` in filter.tpl.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8145
+* fix: when request body is `0`, $body will be null by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8161
+* fix: `spark routes` outputs `<unknown>` only when {locale} with `useSupportedLocalesOnly(true)` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8167
+* fix: Undefined array key error in `spark db:table` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8173
+* fix: force_https() redirects to wrong URL when baseURL has subfolder by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8191
+* fix: Validation raises TypeError when invalid JSON comes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8153
+* fix: FilterTestTrait Undefined variable $filterClasses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8195
+* fix: Image::save() causes error with webp by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8210
+* fix issue where running FileLocator::getClassname() on a directory would cause a PHP error by @colethorsen in https://github.com/codeigniter4/CodeIgniter4/pull/8216
+* fix: make Request::getEnv() deprecated by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8234
+* fix: ExceptionHandler displays incorrect Exception classname by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8239
+* fix: [Cache] Double prefix for increment in FileHandler by @il-coder in https://github.com/codeigniter4/CodeIgniter4/pull/8255
+* docs: fix Database Utility Class `getXMLFromResult()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8276
+* fix: autoload helpers in test bootstrap by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8275
+* fix: Model handling of Entity $primaryKey casting  by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8282
+* fix: Handle non-array JSON in validation by @woodongwong in https://github.com/codeigniter4/CodeIgniter4/pull/8288
+* fix: DEPRECATED error in Honeypot by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8316
+* fix: [Auto Routing Improved] `spark routes` shows incorrect routes when translateURIDashes is enabled by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8320
+* fix: migrations not using custom DB connection of migration runner by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8221
+* Always return a new instance of a Cell by @michalsn in https://github.com/codeigniter4/CodeIgniter4/pull/8330
+* fix: DOMParser cannot see element with `id="0"` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8360
+
+### Refactoring
+
+* [Rector] Apply SingleInArrayToCompareRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/8102
+* refactor: RedisHandler ttl() calls by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8155
+* [Testing] Use assertEqualsWithDelta() when possible by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/8158
+* refactor: replace non-boolean if conditions in Model by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8193
+* refactor: View classes to fix PHPStan errors by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8208
+* refactor: Model by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8260
+* replace -1 with E_ALL in error_reporting calls by @ThomasMeschke in https://github.com/codeigniter4/CodeIgniter4/pull/8212
+* refactor: apply SimplifyEmptyCheckOnEmptyArrayRector by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8341
+* refactor: apply DisallowedEmptyRuleFixerRector by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8344
+* refactor: rely on $config property in ViewDecoratorTrait by @mostafakhudair in https://github.com/codeigniter4/CodeIgniter4/pull/8021
+* refactor: replace empty() Part 1 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8345
+
 ## [v4.4.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.3) (2023-10-26)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.2...v4.4.3)
 
@@ -59,8 +113,6 @@
 * refactor: delete duplicate code for Composer loading by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8004
 * [Rector] Apply BooleanInIfConditionRuleFixerRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/7951
 
-**Full Changelog**: https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.1...v4.4.2
-
 ## [v4.4.1](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.1) (2023-09-05)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.0...v4.4.1)
 
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index b64ce2899051..4fb8fd62693f 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -5,12 +5,12 @@
     xmlns="https://www.phpdoc.org"
     xsi:noNamespaceSchemaLocation="https://docs.phpdoc.org/latest/phpdoc.xsd"
 >
-    <title>CodeIgniter v4.3 API</title>
+    <title>CodeIgniter v4.4 API</title>
     <paths>
         <output>api/build/</output>
         <cache>api/cache/</cache>
     </paths>
-    <version number="4.3.x">
+    <version number="4.4.4">
         <api format="php">
             <source dsn=".">
                 <path>system</path>
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 39a3029f3954..bc23a6e51a7c 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -54,7 +54,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.4.3';
+    public const CI_VERSION = '4.4.4';
 
     /**
      * App startup time.
diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index e1691c91aa1b..e7990adf9173 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -2,7 +2,7 @@
 Version 4.4.4
 #############
 
-Release Date: Unreleased
+Release Date: December 28, 2023
 
 **4.4.4 release of CodeIgniter4**
 
@@ -39,6 +39,11 @@ Filesystem Helper
 :php:func:`get_filenames()` now follows symlink folders, which it previously just returned
 without following.
 
+Enhancements
+************
+
+- Full support for PHP 8.3.
+
 ***************
 Message Changes
 ***************
@@ -46,10 +51,6 @@ Message Changes
 - Added ``HTTP.invalidJSON`` error message.
 - Added ``HTTP.unsupportedJSONFormat`` error message.
 
-*******
-Changes
-*******
-
 ************
 Deprecations
 ************
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index e2598cedc2fd..b71d69fd9eb3 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -26,7 +26,7 @@
 version = '4.4'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.4.3'
+release = '4.4.4'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_444.rst b/user_guide_src/source/installation/upgrade_444.rst
index b3ba0427a236..cb7c48a4b0bb 100644
--- a/user_guide_src/source/installation/upgrade_444.rst
+++ b/user_guide_src/source/installation/upgrade_444.rst
@@ -67,10 +67,6 @@ to a CA bundle for CURLRequest.
 
 CURLRequest option `verify` can also take *boolean* values as usual.
 
-*********************
-Breaking Enhancements
-*********************
-
 *************
 Project Files
 *************
@@ -81,21 +77,25 @@ these files being outside of the **system** scope they will not be changed witho
 There are some third-party CodeIgniter modules available to assist with merging changes to
 the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
 
-Content Changes
-===============
-
-The following files received significant changes (including deprecations or visual adjustments)
-and it is recommended that you merge the updated versions with your application:
-
-Config
-------
-
-- @TODO
-
 All Changes
 ===========
 
 This is a list of all files in the **project space** that received changes;
 many will be simple comments or formatting that have no effect on the runtime:
 
-- @TODO
+- app/Config/App.php
+- app/Config/Autoload.php
+- app/Config/Boot/development.php
+- app/Config/Boot/testing.php
+- app/Config/Cache.php
+- app/Config/Email.php
+- app/Config/Filters.php
+- app/Config/Kint.php
+- app/Config/Modules.php
+- app/Config/Publisher.php
+- app/Config/Session.php
+- app/Views/errors/cli/error_exception.php
+- app/Views/errors/html/error_exception.php
+- composer.json
+- env
+- spark