From 81cead15a32f09fcb45ecd811f66114e5f12e6ca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Aug 2023 15:35:29 +0900
Subject: [PATCH 01/36] docs: update RELEASE.md

---
 admin/RELEASE.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index b625c743a75b..226f0ad3397c 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -11,6 +11,8 @@
 If you release a new minor version.
 
 * Create PR to merge `4.x` into `develop` and merge it
+* Rename the current minor version (e.g., `4.4`) in Setting > Branches >
+  "Branch protection rules" to the next minor version. E.g. `4.4` → `4.5`
 * Delete the merged `4.x` branch (This closes all PRs to the branch)
 * Do the regular release process. Go to the next "Changelog" section
 
@@ -77,6 +79,7 @@ the existing content.
   * 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
+  * 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
 * Create a new PR from `release-4.x.x` to `develop`:
   * Title: `Prep for 4.x.x release`
@@ -113,6 +116,8 @@ the existing content.
   * "[Deploy Distributable Repos](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/deploy-distributables.yml)", the main repo
   * "[Deploy Production](https://github.com/codeigniter4/userguide/actions/workflows/deploy.yml)", UG repo
   * "[pages-build-deployment](https://github.com/codeigniter4/userguide/actions/workflows/pages/pages-build-deployment)", UG repo
+  * Check if "CodeIgniter4.x.x.epub" is added to UG repo. "CodeIgniter.epub" was
+    created when v4.3.8 was released.
 * Fast-forward `develop` branch to catch the merge commit from `master`
     ```console
     git fetch origin

From a2e8e5cbc415573aa286f0102ee4625e7d6bda8e Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 25 Aug 2023 15:48:10 +0800
Subject: [PATCH 02/36] fix: add types for cache handlers

---
 phpstan-baseline.php                       | 55 ----------------------
 system/Cache/Handlers/BaseHandler.php      |  3 ++
 system/Cache/Handlers/DummyHandler.php     |  2 +
 system/Cache/Handlers/FileHandler.php      |  2 +
 system/Cache/Handlers/MemcachedHandler.php |  2 +
 system/Cache/Handlers/PredisHandler.php    |  2 +
 system/Cache/Handlers/RedisHandler.php     |  2 +
 system/Cache/Handlers/WincacheHandler.php  |  2 +
 system/CodeIgniter.php                     |  2 +
 9 files changed, 17 insertions(+), 55 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 9dea6edd8884..ec5d6987990e 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -16,61 +16,11 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/BaseModel.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\BaseHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/BaseHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\BaseHandler\\:\\:remember\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/BaseHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:remember\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\WincacheHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/WincacheHandler.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:bootstrapEnvironment\\(\\) has no return type specified\\.$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/CodeIgniter.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:cache\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/CodeIgniter.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:callExit\\(\\) has no return type specified\\.$#',
 	'count' => 1,
@@ -1436,11 +1386,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/Mock/MockCache.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:remember\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/Mock/MockCache.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCodeIgniter\\:\\:callExit\\(\\) has no return type specified\\.$#',
 	'count' => 1,
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index 9f700370fc8a..74a4482cd4d9 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -77,6 +77,7 @@ public static function validateKey($key, $prefix = ''): string
      * @param string  $key      Cache item name
      * @param int     $ttl      Time to live
      * @param Closure $callback Callback return value
+     * @phpstan-param Closure(): mixed $callback
      *
      * @return array|bool|float|int|object|string|null
      */
@@ -98,6 +99,8 @@ public function remember(string $key, int $ttl, Closure $callback)
      *
      * @param string $pattern Cache items glob-style pattern
      *
+     * @return int|never
+     *
      * @throws Exception
      */
     public function deleteMatching(string $pattern)
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index fd4f1b503111..4349db4f39a5 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -59,6 +59,8 @@ public function delete(string $key)
 
     /**
      * {@inheritDoc}
+     *
+     * @return int
      */
     public function deleteMatching(string $pattern)
     {
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index 524ee8e47720..aea0a605c47f 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -127,6 +127,8 @@ public function delete(string $key)
 
     /**
      * {@inheritDoc}
+     *
+     * @return int
      */
     public function deleteMatching(string $pattern)
     {
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index f38a541113a1..a998ad30386f 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -188,6 +188,8 @@ public function delete(string $key)
 
     /**
      * {@inheritDoc}
+     *
+     * @return never
      */
     public function deleteMatching(string $pattern)
     {
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index ab4fb1ff0a46..e549a7422c91 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -150,6 +150,8 @@ public function delete(string $key)
 
     /**
      * {@inheritDoc}
+     *
+     * @return int
      */
     public function deleteMatching(string $pattern)
     {
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index adb9a581a75a..d86d9f980d41 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -176,6 +176,8 @@ public function delete(string $key)
 
     /**
      * {@inheritDoc}
+     *
+     * @return int
      */
     public function deleteMatching(string $pattern)
     {
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index c5f0f08467e9..b1ea45ded7a2 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -73,6 +73,8 @@ public function delete(string $key)
 
     /**
      * {@inheritDoc}
+     *
+     * @return never
      */
     public function deleteMatching(string $pattern)
     {
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index cc6d3f67de0a..8308dab116cb 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -701,6 +701,8 @@ public function displayCache(Cache $config)
      * Tells the app that the final output should be cached.
      *
      * @deprecated 4.4.0 Moved to ResponseCache::setTtl(). to No longer used.
+     *
+     * @return void
      */
     public static function cache(int $time)
     {

From 7e11339ed67673b2838e4f49402224b022e91e26 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Aug 2023 05:51:31 +0900
Subject: [PATCH 03/36] docs: add missing Mandatory File Changes for Hot Reload

---
 .../source/installation/upgrade_440.rst       | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst
index 0fb292666020..9845360a674e 100644
--- a/user_guide_src/source/installation/upgrade_440.rst
+++ b/user_guide_src/source/installation/upgrade_440.rst
@@ -176,6 +176,76 @@ So you need to do:
 2. Remove all settings in **app/Config/Routes.php** that are no longer needed.
 3. If you use the environment-specific routes files, add them to the ``$routeFiles`` property in **app/Config/Routing.php**.
 
+app/Config/Toolbar.php
+----------------------
+
+You need to add the new properties ``$watchedDirectories`` and ``$watchedExtensions``
+for :ref:`debug-toolbar-hot-reload`::
+
+    --- a/app/Config/Toolbar.php
+    +++ b/app/Config/Toolbar.php
+    @@ -88,4 +88,31 @@ class Toolbar extends BaseConfig
+          * `$maxQueries` defines the maximum amount of queries that will be stored.
+          */
+         public int $maxQueries = 100;
+    +
+    +    /**
+    +     * --------------------------------------------------------------------------
+    +     * Watched Directories
+    +     * --------------------------------------------------------------------------
+    +     *
+    +     * Contains an array of directories that will be watched for changes and
+    +     * used to determine if the hot-reload feature should reload the page or not.
+    +     * We restrict the values to keep performance as high as possible.
+    +     *
+    +     * NOTE: The ROOTPATH will be prepended to all values.
+    +     */
+    +    public array $watchedDirectories = [
+    +        'app',
+    +    ];
+    +
+    +    /**
+    +     * --------------------------------------------------------------------------
+    +     * Watched File Extensions
+    +     * --------------------------------------------------------------------------
+    +     *
+    +     * Contains an array of file extensions that will be watched for changes and
+    +     * used to determine if the hot-reload feature should reload the page or not.
+    +     */
+    +    public array $watchedExtensions = [
+    +        'php', 'css', 'js', 'html', 'svg', 'json', 'env',
+    +    ];
+     }
+
+
+app/Config/Events.php
+---------------------
+
+You need to add the code to add a route for :ref:`debug-toolbar-hot-reload`::
+
+    --- a/app/Config/Events.php
+    +++ b/app/Config/Events.php
+    @@ -4,6 +4,7 @@ namespace Config;
+
+     use CodeIgniter\Events\Events;
+     use CodeIgniter\Exceptions\FrameworkException;
+    +use CodeIgniter\HotReloader\HotReloader;
+
+     /*
+      * --------------------------------------------------------------------
+    @@ -44,5 +45,11 @@ Events::on('pre_system', static function () {
+         if (CI_DEBUG && ! is_cli()) {
+             Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+             Services::toolbar()->respond();
+    +        // Hot Reload route - for framework use on the hot reloader.
+    +        if (ENVIRONMENT === 'development') {
+    +            Services::routes()->get('__hot-reload', static function () {
+    +                (new HotReloader())->run();
+    +            });
+    +        }
+         }
+     });
+
 app/Config/Cookie.php
 ---------------------
 

From c34ae214dde16153ccb183d67c20a8b528164e18 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Aug 2023 05:51:58 +0900
Subject: [PATCH 04/36] docs: remove `-` for listing

Only one item is there.
---
 user_guide_src/source/installation/upgrade_440.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst
index 9845360a674e..76bcc2957a68 100644
--- a/user_guide_src/source/installation/upgrade_440.rst
+++ b/user_guide_src/source/installation/upgrade_440.rst
@@ -155,8 +155,8 @@ Config Files
 app/Config/App.php
 ------------------
 
-- The property ``$proxyIPs`` must be an array. If you don't use proxy servers,
-  it must be ``public array $proxyIPs = [];``.
+The property ``$proxyIPs`` must be an array. If you don't use proxy servers,
+it must be ``public array $proxyIPs = [];``.
 
 .. _upgrade-440-config-routing:
 

From 4bb67f2124568ccfcf04892b55c4862f31f63d52 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Aug 2023 10:09:12 +0900
Subject: [PATCH 05/36] docs: changelog and upgrade for 4.4.1

---
 user_guide_src/source/changelogs/index.rst    |  1 +
 user_guide_src/source/changelogs/v4.4.1.rst   | 29 +++++++++++
 .../source/installation/upgrade_441.rst       | 50 +++++++++++++++++++
 .../source/installation/upgrading.rst         |  1 +
 4 files changed, 81 insertions(+)
 create mode 100644 user_guide_src/source/changelogs/v4.4.1.rst
 create mode 100644 user_guide_src/source/installation/upgrade_441.rst

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 2a04069e2406..dd0ac6db1034 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.1
     v4.4.0
     v4.3.8
     v4.3.7
diff --git a/user_guide_src/source/changelogs/v4.4.1.rst b/user_guide_src/source/changelogs/v4.4.1.rst
new file mode 100644
index 000000000000..b3d229aa210c
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.4.1.rst
@@ -0,0 +1,29 @@
+Version 4.4.1
+#############
+
+Release Date: Unreleased
+
+**4.4.1 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_441.rst b/user_guide_src/source/installation/upgrade_441.rst
new file mode 100644
index 000000000000..9824405edb37
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_441.rst
@@ -0,0 +1,50 @@
+#############################
+Upgrading from 4.4.0 to 4.4.1
+#############################
+
+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 c675327d7412..210b1499c8bb 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_441
     upgrade_440
     upgrade_438
     upgrade_437

From 9dd7cb040a46ef522ac53989213f6c4656396dde Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 09:31:47 +0900
Subject: [PATCH 06/36] test: add test when filter returns response

---
 system/Test/FeatureTestTrait.php           |  6 ++++-
 tests/_support/Config/Filters.php          |  3 ++-
 tests/_support/Filters/RedirectFilter.php  | 27 ++++++++++++++++++++++
 tests/system/Test/FeatureTestTraitTest.php | 15 ++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 tests/_support/Filters/RedirectFilter.php

diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index b117a1d890ae..c59c801d4f4a 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -51,7 +51,11 @@ protected function withRoutes(?array $routes = null)
             $collection->resetRoutes();
 
             foreach ($routes as $route) {
-                $collection->{$route[0]}($route[1], $route[2]);
+                if (isset($route[3])) {
+                    $collection->{$route[0]}($route[1], $route[2], $route[3]);
+                } else {
+                    $collection->{$route[0]}($route[1], $route[2]);
+                }
             }
         }
 
diff --git a/tests/_support/Config/Filters.php b/tests/_support/Config/Filters.php
index 48936397449e..dda1549a7154 100644
--- a/tests/_support/Config/Filters.php
+++ b/tests/_support/Config/Filters.php
@@ -11,4 +11,5 @@
 
 namespace Tests\Support\Config\Filters;
 
-$filters->aliases['test-customfilter'] = \Tests\Support\Filters\Customfilter::class;
+$filters->aliases['test-customfilter']   = \Tests\Support\Filters\Customfilter::class;
+$filters->aliases['test-redirectfilter'] = \Tests\Support\Filters\RedirectFilter::class;
diff --git a/tests/_support/Filters/RedirectFilter.php b/tests/_support/Filters/RedirectFilter.php
new file mode 100644
index 000000000000..b04b0ea18706
--- /dev/null
+++ b/tests/_support/Filters/RedirectFilter.php
@@ -0,0 +1,27 @@
+<?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\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class RedirectFilter implements \CodeIgniter\Filters\FilterInterface
+{
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        return redirect()->to('login');
+    }
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null): void
+    {
+    }
+}
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 0f5bb7ce33d5..c1a341c0aa2b 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -77,6 +77,21 @@ public function testCallGetAndUriString(): void
         $this->assertSame('http://example.com/index.php/foo/bar/1/2/3', current_url());
     }
 
+    public function testCallGetAndFilterReturnsResponse(): void
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'admin',
+                static fn () => 'Admin Area',
+                ['filter' => 'test-redirectfilter'],
+            ],
+        ]);
+        $response = $this->get('admin');
+
+        $response->assertRedirectTo('login');
+    }
+
     public function testClosureWithEcho()
     {
         $this->withRoutes([

From e28b9d79c6f7b7804cef54a6c6aea8b10f9cf3ea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 09:34:31 +0900
Subject: [PATCH 07/36] fix: add missing outputBufferingEnd()

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 8308dab116cb..e991af8de121 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -468,6 +468,8 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
 
             // If a ResponseInterface instance is returned then send it back to the client and stop
             if ($possibleResponse instanceof ResponseInterface) {
+                $this->outputBufferingEnd();
+
                 return $possibleResponse;
             }
 

From 1e91936c00dd73d5b260ce6718124dc2230e9ce8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 09:50:03 +0900
Subject: [PATCH 08/36] docs: suppress paslm error

---
 tests/_support/Config/Filters.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/_support/Config/Filters.php b/tests/_support/Config/Filters.php
index dda1549a7154..5cb70bef1676 100644
--- a/tests/_support/Config/Filters.php
+++ b/tests/_support/Config/Filters.php
@@ -11,5 +11,8 @@
 
 namespace Tests\Support\Config\Filters;
 
+/**
+ * @psalm-suppress UndefinedGlobalVariable
+ */
 $filters->aliases['test-customfilter']   = \Tests\Support\Filters\Customfilter::class;
 $filters->aliases['test-redirectfilter'] = \Tests\Support\Filters\RedirectFilter::class;

From 936d298507087bd8c2bef7e6141034fb849a15c5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 10:19:14 +0900
Subject: [PATCH 09/36] test: add test for get same config with different alias

If the request class is the same, it is better to return the shared
instance.
---
 tests/system/Config/FactoriesTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index c5936a7c341f..b53c1e9133e5 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use Config\App;
 use Config\Database;
 use InvalidArgumentException;
 use ReflectionClass;
@@ -322,6 +323,14 @@ public function testCanLoadTwoCellsWithSameShortName()
         $this->assertNotSame($cell1, $cell2);
     }
 
+    public function testCanLoadSharedConfigWithDifferentAlias()
+    {
+        $config1 = Factories::config(App::class);
+        $config2 = Factories::config('App');
+
+        $this->assertSame($config1, $config2);
+    }
+
     public function testDefineSameAliasTwiceWithDifferentClasses()
     {
         $this->expectException(InvalidArgumentException::class);

From 42f90a2d09bf1aaf55ffe98a3c3f141989723cba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 10:20:42 +0900
Subject: [PATCH 10/36] fix: Factories do not return shared instance

If it is called by different aliase like `'App'` and `App::class`.
But if they are exactly the same FQCN, the shared instance should
be returned.
---
 system/Config/Factories.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 0eb6d2443e44..935c80bad445 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -142,6 +142,7 @@ public static function __callStatic(string $component, array $arguments)
                 return new $class(...$arguments);
             }
 
+            // Try to locate the class
             if ($class = self::locateClass($options, $alias)) {
                 return new $class(...$arguments);
             }
@@ -179,6 +180,7 @@ public static function __callStatic(string $component, array $arguments)
      */
     private static function getDefinedInstance(array $options, string $alias, array $arguments)
     {
+        // The alias is already defined.
         if (isset(self::$aliases[$options['component']][$alias])) {
             $class = self::$aliases[$options['component']][$alias];
 
@@ -195,6 +197,21 @@ private static function getDefinedInstance(array $options, string $alias, array
             }
         }
 
+        // Try to locate the class
+        if (! $class = self::locateClass($options, $alias)) {
+            return null;
+        }
+
+        // Need to verify if the shared instance matches the request
+        if (self::verifyInstanceOf($options, $class)) {
+            // Check for an existing instance for the class
+            if (isset(self::$instances[$options['component']][$class])) {
+                self::$aliases[$options['component']][$alias] = $class;
+
+                return self::$instances[$options['component']][$class];
+            }
+        }
+
         return null;
     }
 

From 39243390d772643f8b17ecc53ef2b9abe8dd2734 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 10:34:28 +0900
Subject: [PATCH 11/36] fix: Config cache may not be updated

---
 system/Config/Factories.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 935c80bad445..23a95e13b85f 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -118,6 +118,7 @@ public static function define(string $component, string $alias, string $classnam
         self::getOptions($component);
 
         self::$aliases[$component][$alias] = $classname;
+        self::$updated[$component]         = true;
     }
 
     /**
@@ -192,6 +193,7 @@ private static function getDefinedInstance(array $options, string $alias, array
                 }
 
                 self::$instances[$options['component']][$class] = new $class(...$arguments);
+                self::$updated[$options['component']]           = true;
 
                 return self::$instances[$options['component']][$class];
             }
@@ -207,6 +209,7 @@ private static function getDefinedInstance(array $options, string $alias, array
             // Check for an existing instance for the class
             if (isset(self::$instances[$options['component']][$class])) {
                 self::$aliases[$options['component']][$alias] = $class;
+                self::$updated[$options['component']]         = true;
 
                 return self::$instances[$options['component']][$class];
             }

From 65a138521c6d8de8dad19bb5f097430e97431d76 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 10:49:29 +0900
Subject: [PATCH 12/36] refactor: extract method

---
 system/Config/Factories.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 23a95e13b85f..4e0218a6e835 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -162,9 +162,8 @@ public static function __callStatic(string $component, array $arguments)
             return null;
         }
 
-        self::$instances[$options['component']][$class] = new $class(...$arguments);
-        self::$aliases[$options['component']][$alias]   = $class;
-        self::$updated[$options['component']]           = true;
+        self::createInstance($options['component'], $class, $arguments);
+        self::$aliases[$options['component']][$alias] = $class;
 
         // If a short classname is specified, also register FQCN to share the instance.
         if (! isset(self::$aliases[$options['component']][$class])) {
@@ -192,8 +191,7 @@ private static function getDefinedInstance(array $options, string $alias, array
                     return self::$instances[$options['component']][$class];
                 }
 
-                self::$instances[$options['component']][$class] = new $class(...$arguments);
-                self::$updated[$options['component']]           = true;
+                self::createInstance($options['component'], $class, $arguments);
 
                 return self::$instances[$options['component']][$class];
             }
@@ -218,6 +216,15 @@ private static function getDefinedInstance(array $options, string $alias, array
         return null;
     }
 
+    /**
+     * Creates the shared instance.
+     */
+    private static function createInstance(string $component, string $class, array $arguments): void
+    {
+        self::$instances[$component][$class] = new $class(...$arguments);
+        self::$updated[$component]           = true;
+    }
+
     /**
      * Is the component Config?
      *

From 896b04717586503a619785816e8dc0f4e9f83faf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 11:05:20 +0900
Subject: [PATCH 13/36] refactor: extract method

---
 system/Config/Factories.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 4e0218a6e835..a160793d3742 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -163,11 +163,11 @@ public static function __callStatic(string $component, array $arguments)
         }
 
         self::createInstance($options['component'], $class, $arguments);
-        self::$aliases[$options['component']][$alias] = $class;
+        self::setAlias($options['component'], $alias, $class);
 
         // If a short classname is specified, also register FQCN to share the instance.
         if (! isset(self::$aliases[$options['component']][$class])) {
-            self::$aliases[$options['component']][$class] = $class;
+            self::setAlias($options['component'], $class, $class);
         }
 
         return self::$instances[$options['component']][$class];
@@ -206,8 +206,7 @@ private static function getDefinedInstance(array $options, string $alias, array
         if (self::verifyInstanceOf($options, $class)) {
             // Check for an existing instance for the class
             if (isset(self::$instances[$options['component']][$class])) {
-                self::$aliases[$options['component']][$alias] = $class;
-                self::$updated[$options['component']]         = true;
+                self::setAlias($options['component'], $alias, $class);
 
                 return self::$instances[$options['component']][$class];
             }
@@ -225,6 +224,15 @@ private static function createInstance(string $component, string $class, array $
         self::$updated[$component]           = true;
     }
 
+    /**
+     * Sets alias
+     */
+    private static function setAlias(string $component, string $alias, string $class): void
+    {
+        self::$aliases[$component][$alias] = $class;
+        self::$updated[$component]         = true;
+    }
+
     /**
      * Is the component Config?
      *

From a895f634b32dfb5b7b63f370c8927787af103e24 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 11:07:34 +0900
Subject: [PATCH 14/36] refactor: move logic

---
 system/Config/Factories.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index a160793d3742..2e24b5cef65c 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -165,11 +165,6 @@ public static function __callStatic(string $component, array $arguments)
         self::createInstance($options['component'], $class, $arguments);
         self::setAlias($options['component'], $alias, $class);
 
-        // If a short classname is specified, also register FQCN to share the instance.
-        if (! isset(self::$aliases[$options['component']][$class])) {
-            self::setAlias($options['component'], $class, $class);
-        }
-
         return self::$instances[$options['component']][$class];
     }
 
@@ -231,6 +226,11 @@ private static function setAlias(string $component, string $alias, string $class
     {
         self::$aliases[$component][$alias] = $class;
         self::$updated[$component]         = true;
+
+        // If a short classname is specified, also register FQCN to share the instance.
+        if (! isset(self::$aliases[$component][$class])) {
+            self::$aliases[$component][$class] = $class;
+        }
     }
 
     /**

From add2cbdbea526b97805d56209cad92b970d6f746 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 11:11:46 +0900
Subject: [PATCH 15/36] refactor: change if condition

This is more intuitive.
---
 system/Config/Factories.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 2e24b5cef65c..ba49e9360a91 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -228,7 +228,7 @@ private static function setAlias(string $component, string $alias, string $class
         self::$updated[$component]         = true;
 
         // If a short classname is specified, also register FQCN to share the instance.
-        if (! isset(self::$aliases[$component][$class])) {
+        if (! isset(self::$aliases[$component][$class]) && ! self::isNamespaced($alias)) {
             self::$aliases[$component][$class] = $class;
         }
     }

From 1b8847914ae5252186544381ea6476368528c18f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 11:19:30 +0900
Subject: [PATCH 16/36] refactor: remove unnecessary verifyInstanceOf()

Because locateClass() already checks it.
---
 system/Config/Factories.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index ba49e9360a91..6db25549dca9 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -197,14 +197,11 @@ private static function getDefinedInstance(array $options, string $alias, array
             return null;
         }
 
-        // Need to verify if the shared instance matches the request
-        if (self::verifyInstanceOf($options, $class)) {
-            // Check for an existing instance for the class
-            if (isset(self::$instances[$options['component']][$class])) {
-                self::setAlias($options['component'], $alias, $class);
+        // Check for an existing instance for the class
+        if (isset(self::$instances[$options['component']][$class])) {
+            self::setAlias($options['component'], $alias, $class);
 
-                return self::$instances[$options['component']][$class];
-            }
+            return self::$instances[$options['component']][$class];
         }
 
         return null;

From b9efbfc9d5c2d44300161b94e959b0dffe39d681 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Aug 2023 15:32:10 +0900
Subject: [PATCH 17/36] docs: add @immutable

There is no reason to change the values after the instantiation.
---
 app/Config/Autoload.php          | 2 ++
 app/Config/DocTypes.php          | 3 +++
 app/Config/ForeignCharacters.php | 3 +++
 app/Config/Mimes.php             | 2 ++
 app/Config/Modules.php           | 2 ++
 5 files changed, 12 insertions(+)

diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index e9ee6613d22b..22f05ecdab26 100644
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -17,6 +17,8 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
+ *
+ * @immutable
  */
 class Autoload extends AutoloadConfig
 {
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
index 788d68fdc117..7e8aaacf09dd 100755
--- a/app/Config/DocTypes.php
+++ b/app/Config/DocTypes.php
@@ -2,6 +2,9 @@
 
 namespace Config;
 
+/**
+ * @immutable
+ */
 class DocTypes
 {
     /**
diff --git a/app/Config/ForeignCharacters.php b/app/Config/ForeignCharacters.php
index 174ddb16a872..f1a95725c5c7 100644
--- a/app/Config/ForeignCharacters.php
+++ b/app/Config/ForeignCharacters.php
@@ -4,6 +4,9 @@
 
 use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
 
+/**
+ * @immutable
+ */
 class ForeignCharacters extends BaseForeignCharacters
 {
 }
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 99d28e5f8f86..d02df1aba796 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -15,6 +15,8 @@
  *
  * When working with mime types, please make sure you have the ´fileinfo´
  * extension enabled to reliably detect the media types.
+ *
+ * @immutable
  */
 class Mimes
 {
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
index 54079e771f29..f84580c856d3 100644
--- a/app/Config/Modules.php
+++ b/app/Config/Modules.php
@@ -9,6 +9,8 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
+ *
+ * @immutable
  */
 class Modules extends BaseModules
 {

From aa93ae25ab047aed9c41b847e17388104d893656 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Aug 2023 05:45:17 +0900
Subject: [PATCH 18/36] test: add feature test for auto routing legacy

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

diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 0f5bb7ce33d5..aee912281c76 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -11,9 +11,11 @@
 
 namespace CodeIgniter\Test;
 
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Response;
+use Config\Routing;
 use Config\Services;
 
 /**
@@ -616,4 +618,15 @@ public function testSetupRequestBodyWithBody(): void
 
         $this->assertSame('test', $request->getBody());
     }
+
+    public function testAutoRoutingLegacy()
+    {
+        $config            = config(Routing::class);
+        $config->autoRoute = true;
+        Factories::injectMock('config', Routing::class, $config);
+
+        $response = $this->get('home/index');
+
+        $response->assertOK();
+    }
 }

From 681f74d0059c6e819189c7a1bc8b038dc9af63c4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Aug 2023 05:46:05 +0900
Subject: [PATCH 19/36] fix: auto routing legacy does not work at all

---
 system/Router/RouteCollection.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 82c6a6dd5bbe..36b8e4d52340 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -28,7 +28,9 @@ class RouteCollection implements RouteCollectionInterface
 {
     /**
      * The namespace to be added to any Controllers.
-     * Defaults to the global namespaces (\)
+     * Defaults to the global namespaces (\).
+     *
+     * This must have a trailing backslash (\).
      *
      * @var string
      */
@@ -288,7 +290,7 @@ public function __construct(FileLocator $locator, Modules $moduleConfig, Routing
         $this->httpHost = Services::request()->getServer('HTTP_HOST');
 
         // Setup based on config file. Let routes file override.
-        $this->defaultNamespace   = $routing->defaultNamespace;
+        $this->defaultNamespace   = rtrim($routing->defaultNamespace, '\\') . '\\';
         $this->defaultController  = $routing->defaultController;
         $this->defaultMethod      = $routing->defaultMethod;
         $this->translateURIDashes = $routing->translateURIDashes;

From 45709418db8067b699fbe93a058b72c2e9c27e22 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 29 Aug 2023 10:01:05 +0900
Subject: [PATCH 20/36] fix: replace `config(DocTypes::class)` with `new
 DocTypes()`

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

diff --git a/system/Common.php b/system/Common.php
index ff9ca929c9f9..03f72640e92e 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -890,7 +890,8 @@ function redirect(?string $route = null): RedirectResponse
      */
     function _solidus(): string
     {
-        if (config(DocTypes::class)->html5 ?? false) {
+        $docTypes = new DocTypes();
+        if ($docTypes->html5 ?? false) {
             return '';
         }
 
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index 1ca7a56ff598..fb05b68faefe 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
      */
     public function nl2brExceptPre(string $str): string
     {
-        $newstr = '';
+        $newstr   = '';
+        $docTypes = new DocTypes();
 
         for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
-            $xhtml = ! (config(DocTypes::class)->html5 ?? false);
+            $xhtml = ! ($docTypes->html5 ?? false);
             $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];
 
             if ($ct - 1 !== $i) {

From 3474bc51628915c5c86a3469d8c228073bd01153 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 29 Aug 2023 15:31:25 +0900
Subject: [PATCH 21/36] refactor: add way to chnage DocTypes for testing

---
 system/Common.php                       | 13 +++-
 tests/system/CommonFunctionsTest.php    | 21 +++++--
 tests/system/Helpers/FormHelperTest.php | 35 ++++++-----
 tests/system/Helpers/HTMLHelperTest.php | 81 +++++++++++--------------
 4 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 03f72640e92e..c964e10ea899 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -886,11 +886,20 @@ function redirect(?string $route = null): RedirectResponse
     /**
      * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
      *
+     * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
+     *
      * @internal
      */
-    function _solidus(): string
+    function _solidus(?DocTypes $docTypesConfig = null): string
     {
-        $docTypes = new DocTypes();
+        static $docTypes = null;
+
+        if ($docTypesConfig !== null) {
+            $docTypes = $docTypesConfig;
+        }
+
+        $docTypes ??= new DocTypes();
+
         if ($docTypes->html5 ?? false) {
             return '';
         }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index c678a0dd1fbb..b6702c5a7376 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -31,6 +31,7 @@
 use CodeIgniter\Test\TestLogger;
 use Config\App;
 use Config\Cookie;
+use Config\DocTypes;
 use Config\Logger;
 use Config\Modules;
 use Config\Routing;
@@ -180,14 +181,24 @@ public function testSolidusElement(): void
 
     public function testSolidusElementXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $this->assertSame(' /', _solidus());
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
+    }
+
+    private function disableHtml5()
+    {
+        $doctypes        = new DocTypes();
+        $doctypes->html5 = false;
+        _solidus($doctypes);
+    }
+
+    private function enableHtml5()
+    {
+        $doctypes = new DocTypes();
+        _solidus($doctypes);
     }
 
     public function testView(): void
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 8ed1bdeb7201..3b2482513581 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
+use Config\DocTypes;
 use Config\Filters;
 use Config\Services;
 
@@ -262,9 +263,7 @@ public function testFormInput(): void
 
     public function testFormInputXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<EOH
             <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
         ];
         $this->assertSame($expected, form_input($data));
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
+    }
+
+    private function disableHtml5()
+    {
+        $doctypes        = new DocTypes();
+        $doctypes->html5 = false;
+        _solidus($doctypes);
+    }
+
+    private function enableHtml5()
+    {
+        $doctypes = new DocTypes();
+        _solidus($doctypes);
     }
 
     public function testFormInputWithExtra(): void
@@ -317,17 +328,14 @@ public function testFormUpload(): void
 
     public function testFormUploadXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<EOH
             <input type="file" name="attachment" />\n
             EOH;
         $this->assertSame($expected, form_upload('attachment'));
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testFormTextarea(): void
@@ -656,17 +664,14 @@ public function testFormCheckbox(): void
 
     public function testFormCheckboxXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<EOH
             <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
             EOH;
         $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testFormCheckboxArrayData(): void
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 0d9452640730..f591b841024d 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
+use Config\DocTypes;
 
 /**
  * @internal
@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void
 
     public function testIMGXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $target   = 'http://site.com/images/picture.jpg';
         $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
         $this->assertSame($expected, img($target));
 
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
-    public function testIMGXHTMLWithoutProtocol(): void
+    private function disableHtml5()
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
+        $doctypes        = new DocTypes();
         $doctypes->html5 = false;
+        _solidus($doctypes);
+    }
+
+    private function enableHtml5()
+    {
+        $doctypes = new DocTypes();
+        _solidus($doctypes);
+    }
+
+    public function testIMGXHTMLWithoutProtocol(): void
+    {
+        $this->disableHtml5();
 
         $target   = 'assets/mugshot.jpg';
         $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
         $this->assertSame($expected, img($target));
 
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testIMGXHTMLWithIndexpage(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $target   = 'assets/mugshot.jpg';
         $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
         $this->assertSame($expected, img($target, true));
 
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testImgData(): void
@@ -355,16 +363,13 @@ public function testLinkTag(): void
 
     public function testLinkTagXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $target   = 'css/mystyles.css';
         $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
         $this->assertSame($expected, link_tag($target));
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testLinkTagMedia(): void
@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void
 
     public function testVideoWithTracksXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<'EOH'
             <video src="http://example.com/test.mp4" controls>
@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
         $video = video($target, $message, 'controls', $tracks);
         $this->assertSame($expected, $video);
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testVideoWithTracksAndIndex(): void
@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void
 
     public function testVideoMultipleSourcesXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<'EOH'
             <video class="test" controls>
@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void
 
         $this->assertSame($expected, $video);
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testAudio(): void
@@ -642,9 +641,7 @@ public function testAudio(): void
 
     public function testAudioXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<'EOH'
             <audio id="test" controls>
@@ -670,8 +667,7 @@ public function testAudioXHTML(): void
 
         $this->assertSame($expected, $audio);
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testAudioSimple(): void
@@ -774,15 +770,12 @@ public function testSource(): void
 
     public function testSourceXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
         $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testEmbed(): void
@@ -799,9 +792,7 @@ public function testEmbed(): void
 
     public function testEmbedXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<'EOH'
             <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
         $embed = embed('movie.mov', $type, 'class="test"');
         $this->assertSame($expected, $embed);
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testEmbedIndexed(): void
@@ -862,9 +852,7 @@ public function testObjectWithParams(): void
 
     public function testObjectWithParamsXHTML(): void
     {
-        $doctypes        = config('DocTypes');
-        $default         = $doctypes->html5;
-        $doctypes->html5 = false;
+        $this->disableHtml5();
 
         $expected = <<<'EOH'
             <object data="http://example.com/movie.swf" class="test">
@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
         $object = object('movie.swf', $type, 'class="test"', $parms);
         $this->assertSame($expected, $object);
 
-        // Reset
-        $doctypes->html5 = $default;
+        $this->enableHtml5();
     }
 
     public function testObjectIndexed(): void

From c1cd3517cb94c006dc60041107ad0b4e71b79fe4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 15:58:34 +0000
Subject: [PATCH 22/36] build(deps-dev): update rector/rector requirement from
 0.18.0 to 0.18.1

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.0...0.18.1)

---
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 997ca73ebb89..9421a652fb7a 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.0",
+        "rector/rector": "0.18.1",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

From f34580d02b746fe68662538879b072455e950506 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 09:48:17 +0900
Subject: [PATCH 23/36] docs: fix or remove @param

php-cs-fixer has been modified to remove these tags.
---
 system/CLI/CLI.php                                   |  2 +-
 system/Config/Services.php                           |  2 +-
 system/Database/BaseBuilder.php                      |  1 -
 system/Database/Migration.php                        |  4 ----
 system/Database/Query.php                            |  2 --
 system/Debug/Toolbar.php                             |  3 ---
 system/Encryption/Exceptions/EncryptionException.php |  2 --
 system/Entity/Entity.php                             |  2 +-
 system/Format/Exceptions/FormatException.php         |  2 +-
 system/HTTP/URI.php                                  |  2 --
 system/HTTP/UserAgent.php                            |  6 ------
 system/Images/Handlers/BaseHandler.php               |  2 --
 system/Images/ImageHandlerInterface.php              |  2 +-
 system/Log/Handlers/ChromeLoggerHandler.php          |  2 --
 system/Pager/Pager.php                               |  2 --
 system/Router/RouteCollectionInterface.php           |  7 ++++---
 system/Test/DOMParser.php                            |  5 -----
 system/Test/FeatureTestCase.php                      |  2 --
 system/Test/FeatureTestTrait.php                     |  2 +-
 system/Validation/CreditCardRules.php                |  2 --
 system/Validation/FormatRules.php                    | 10 ----------
 system/Validation/Rules.php                          |  4 ----
 tests/_support/Config/Services.php                   |  2 +-
 23 files changed, 11 insertions(+), 59 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 044f9dbbc8fd..112a662d35ac 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -177,7 +177,7 @@ public static function init()
      * Named options must be in the following formats:
      * php index.php user -v --v -name=John --name=John
      *
-     * @param string $prefix
+     * @param string $prefix You may specify a string with which to prompt the user.
      */
     public static function input(?string $prefix = null): string
     {
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 2a4596bf203c..720bb3c487ce 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -781,7 +781,7 @@ public static function toolbar(?ToolbarConfig $config = null, bool $getShared =
     /**
      * The URI class provides a way to model and manipulate URIs.
      *
-     * @param string $uri
+     * @param string|null $uri The URI string
      *
      * @return URI The current URI if $uri is null.
      */
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 07486cffaeec..302020323577 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -706,7 +706,6 @@ public function where($key, $value = null, ?bool $escape = null)
      *
      * @param array|RawSql|string $key
      * @param mixed               $value
-     * @param bool                $escape
      *
      * @return $this
      */
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index 0f1ab2c74f2f..1616830f9267 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -41,8 +41,6 @@ abstract class Migration
 
     /**
      * Constructor.
-     *
-     * @param Forge $forge
      */
     public function __construct(?Forge $forge = null)
     {
@@ -53,8 +51,6 @@ public function __construct(?Forge $forge = null)
 
     /**
      * Returns the database group name this migration uses.
-     *
-     * @return string
      */
     public function getDBGroup(): ?string
     {
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 702575ca857c..a78190a21798 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -167,8 +167,6 @@ public function getQuery(): string
      * for it's start and end values. If no end value is present, will
      * use the current time to determine total duration.
      *
-     * @param float $end
-     *
      * @return $this
      */
     public function setDuration(float $start, ?float $end = null)
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index d20125b9b5bd..19a67b455db3 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -346,9 +346,6 @@ protected function roundTo(float $number, int $increments = 5): float
     /**
      * Prepare for debugging..
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     *
      * @return void
      */
     public function prepare(?RequestInterface $request = null, ?ResponseInterface $response = null)
diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php
index d226fd5dd08b..41a96b69e34a 100644
--- a/system/Encryption/Exceptions/EncryptionException.php
+++ b/system/Encryption/Exceptions/EncryptionException.php
@@ -45,8 +45,6 @@ public static function forNoHandlerAvailable(string $handler)
     /**
      * Thrown when the handler requested is unknown.
      *
-     * @param string $driver
-     *
      * @return static
      */
     public static function forUnKnownHandler(?string $driver = null)
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 0481cc35823f..dd4f54c928bf 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -136,7 +136,7 @@ public function __construct(?array $data = null)
      * properties, using any `setCamelCasedProperty()` methods
      * that may or may not exist.
      *
-     * @param array $data
+     * @param array<string, array|bool|float|int|object|string|null> $data
      *
      * @return $this
      */
diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php
index cfe39d3b8307..55c36d3d23aa 100644
--- a/system/Format/Exceptions/FormatException.php
+++ b/system/Format/Exceptions/FormatException.php
@@ -36,7 +36,7 @@ public static function forInvalidFormatter(string $class)
      * Thrown in JSONFormatter when the json_encode produces
      * an error code other than JSON_ERROR_NONE and JSON_ERROR_RECURSION.
      *
-     * @param string $error
+     * @param string $error The error message
      *
      * @return static
      */
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index fb9d780c1485..a149c4102f34 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -778,8 +778,6 @@ public function setHost(string $str)
     /**
      * Sets the port portion of the URI.
      *
-     * @param int $port
-     *
      * @return $this
      *
      * @TODO PSR-7: Should be `withPort($port)`.
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 1ccc2109c119..02797b2d20c3 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -112,8 +112,6 @@ public function __construct(?UserAgents $config = null)
 
     /**
      * Is Browser
-     *
-     * @param string $key
      */
     public function isBrowser(?string $key = null): bool
     {
@@ -132,8 +130,6 @@ public function isBrowser(?string $key = null): bool
 
     /**
      * Is Robot
-     *
-     * @param string $key
      */
     public function isRobot(?string $key = null): bool
     {
@@ -152,8 +148,6 @@ public function isRobot(?string $key = null): bool
 
     /**
      * Is Mobile
-     *
-     * @param string $key
      */
     public function isMobile(?string $key = null): bool
     {
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 134c7c6ce1cd..cf23fd0fcd23 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -549,8 +549,6 @@ public function getEXIF(?string $key = null, bool $silent = false)
      *  - bottom
      *  - bottom-right
      *
-     * @param int $height
-     *
      * @return BaseHandler
      */
     public function fit(int $width, ?int $height = null, string $position = 'center')
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index 2b924720d2dd..1c3593a99bd4 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 $target
+     * @param string|null $target The path to save the file to.
      *
      * @return bool
      */
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index 9ce30a822364..3354e5fb2db8 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -149,8 +149,6 @@ protected function format($object)
     /**
      * Attaches the header and the content to the passed in request object.
      *
-     * @param ResponseInterface $response
-     *
      * @return void
      */
     public function sendLogs(?ResponseInterface &$response = null)
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 2c666e2ce579..3a9f5a772f0a 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -387,8 +387,6 @@ public function only(array $queries): self
     /**
      * Ensures that an array exists for the group specified.
      *
-     * @param int $perPage
-     *
      * @return void
      */
     protected function ensureGroup(string $group, ?int $perPage = null)
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index 0ca43523a89b..00f1d4c8bdc2 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -28,8 +28,9 @@ interface RouteCollectionInterface
     /**
      * Adds a single route to the collection.
      *
-     * @param array|Closure|string $to
-     * @param array                $options
+     * @param string               $from    The route path (with placeholders or regex)
+     * @param array|Closure|string $to      The route handler
+     * @param array|null           $options The route options
      *
      * @return RouteCollectionInterface
      */
@@ -44,7 +45,7 @@ public function add(string $from, $to, ?array $options = null);
      * multiple placeholders added at once.
      *
      * @param array|string $placeholder
-     * @param string       $pattern
+     * @param string|null  $pattern     The regex pattern
      *
      * @return RouteCollectionInterface
      */
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 5ab12e44ab29..54762643e38d 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -101,9 +101,6 @@ public function withFile(string $path)
 
     /**
      * Checks to see if the text is found within the result.
-     *
-     * @param string $search
-     * @param string $element
      */
     public function see(?string $search = null, ?string $element = null): bool
     {
@@ -121,8 +118,6 @@ public function see(?string $search = null, ?string $element = null): bool
 
     /**
      * Checks to see if the text is NOT found within the result.
-     *
-     * @param string $search
      */
     public function dontSee(?string $search = null, ?string $element = null): bool
     {
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 371e302c59ae..02835391ca48 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -51,8 +51,6 @@ class FeatureTestCase extends CIUnitTestCase
      *    ['get', 'home', 'Home::index']
      * ]
      *
-     * @param array $routes
-     *
      * @return $this
      */
     protected function withRoutes(?array $routes = null)
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index b117a1d890ae..8243d806bcbc 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -39,7 +39,7 @@ trait FeatureTestTrait
      *    ['get', 'home', 'Home::index']
      * ]
      *
-     * @param array $routes
+     * @param array|null $routes Array to set routes
      *
      * @return $this
      */
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 9e18f4ef5cb9..8b0e3842a128 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -236,8 +236,6 @@ public function valid_cc_number(?string $ccNumber, string $type): bool
 
     /**
      * Checks the given number to see if the number passing a Luhn check.
-     *
-     * @param string $number
      */
     protected function isValidLuhn(?string $number = null): bool
     {
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index bc4301c2a086..485b9efec2df 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -176,8 +176,6 @@ public function regex_match(?string $str, string $pattern): bool
      * timezone_identifiers_list function.
      *
      * @see http://php.net/manual/en/datetimezone.listidentifiers.php
-     *
-     * @param string $str
      */
     public function timezone(?string $str = null): bool
     {
@@ -189,8 +187,6 @@ public function timezone(?string $str = null): bool
      *
      * Tests a string for characters outside of the Base64 alphabet
      * as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045
-     *
-     * @param string $str
      */
     public function valid_base64(?string $str = null): bool
     {
@@ -203,8 +199,6 @@ public function valid_base64(?string $str = null): bool
 
     /**
      * Valid JSON
-     *
-     * @param string $str
      */
     public function valid_json(?string $str = null): bool
     {
@@ -215,8 +209,6 @@ public function valid_json(?string $str = null): bool
 
     /**
      * Checks for a correctly formatted email address
-     *
-     * @param string $str
      */
     public function valid_email(?string $str = null): bool
     {
@@ -233,8 +225,6 @@ public function valid_email(?string $str = null): bool
      *
      * Example:
      *     valid_emails[one@example.com,two@example.com]
-     *
-     * @param string $str
      */
     public function valid_emails(?string $str = null): bool
     {
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 1bb2c243ebf5..e85b7443088e 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -204,8 +204,6 @@ public function min_length(?string $str, string $val): bool
 
     /**
      * Does not equal the static value provided.
-     *
-     * @param string $str
      */
     public function not_equals(?string $str, string $val): bool
     {
@@ -214,8 +212,6 @@ public function not_equals(?string $str, string $val): bool
 
     /**
      * Value should not be within an array of values.
-     *
-     * @param string $value
      */
     public function not_in_list(?string $value, string $list): bool
     {
diff --git a/tests/_support/Config/Services.php b/tests/_support/Config/Services.php
index e051ea8d6b24..379211712af9 100644
--- a/tests/_support/Config/Services.php
+++ b/tests/_support/Config/Services.php
@@ -28,7 +28,7 @@ class Services extends BaseServices
     /**
      * The URI class provides a way to model and manipulate URIs.
      *
-     * @param string $uri
+     * @param string|null $uri The URI string
      *
      * @return URI
      */

From ab63068d3331c69cbe56a566474e3ca3eabaab9a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 11:12:21 +0900
Subject: [PATCH 24/36] test: add tests for reverse routing

---
 .../system/Helpers/URLHelper/MiscUrlTest.php  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index ecb59e1ef2b5..85466b151a2e 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -906,6 +906,43 @@ public function testUrlToWithSupportedLocaleInRoute(): void
         );
     }
 
+    public function testUrlToWithNamedRouteWithNestedParentheses(): void
+    {
+        Services::createRequest(new App());
+        $routes = service('routes');
+
+        // The route will be:
+        //   docs/(master|\d+\.(?:\d+|x))/([a-z0-9-]+)
+        $routes->addPlaceholder([
+            'version' => 'master|\d+\.(?:\d+|x)',
+            'page'    => '[a-z0-9-]+',
+        ]);
+        $routes->get('docs/(:version)/(:page)', static function () {
+            echo 'Test the documentation segment';
+        }, ['as' => 'docs.version']);
+
+        $this->assertSame(
+            'http://example.com/index.php/docs/10.9/install',
+            url_to('docs.version', '10.9', 'install')
+        );
+    }
+
+    public function testUrlToWithRouteWithNestedParentheses(): void
+    {
+        Services::createRequest(new App());
+        $routes = service('routes');
+
+        // The route will be:
+        //   images/(^.*\.(?:jpg|png)$)
+        $routes->addPlaceholder('imgFileExt', '^.*\.(?:jpg|png)$');
+        $routes->get('images/(:imgFileExt)', 'Images::getFile/$1');
+
+        $this->assertSame(
+            'http://example.com/index.php/images/test.jpg',
+            url_to('Images::getFile', 'test.jpg')
+        );
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/7651
      */

From ec489c3a2c5280c30c34059787aaf94a3bd0fd1c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 11:13:18 +0900
Subject: [PATCH 25/36] fix: reverse routing causes ErrorException

ErrorException : preg_match(): Compilation failed: missing closing parenthesis
---
 system/Router/RouteCollection.php | 42 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 36b8e4d52340..54f7e1d15c7b 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1151,11 +1151,13 @@ public function environment(string $env, Closure $callback): RouteCollectionInte
     public function reverseRoute(string $search, ...$params)
     {
         // Named routes get higher priority.
-        foreach ($this->routesNames as $collection) {
+        foreach ($this->routesNames as $verb => $collection) {
             if (array_key_exists($search, $collection)) {
                 $routeKey = $collection[$search];
 
-                return $this->buildReverseRoute($routeKey, $params);
+                $from = $this->routes[$verb][$routeKey]['from'];
+
+                return $this->buildReverseRoute($from, $params);
             }
         }
 
@@ -1172,7 +1174,8 @@ public function reverseRoute(string $search, ...$params)
         // all routes to find a match.
         foreach ($this->routes as $collection) {
             foreach ($collection as $routeKey => $route) {
-                $to = $route['handler'];
+                $to   = $route['handler'];
+                $from = $route['from'];
 
                 // ignore closures
                 if (! is_string($to)) {
@@ -1196,7 +1199,7 @@ public function reverseRoute(string $search, ...$params)
                     continue;
                 }
 
-                return $this->buildReverseRoute($routeKey, $params);
+                return $this->buildReverseRoute($from, $params);
             }
         }
 
@@ -1311,21 +1314,21 @@ protected function fillRouteParams(string $from, ?array $params = null): string
      * @param array $params One or more parameters to be passed to the route.
      *                      The last parameter allows you to set the locale.
      */
-    protected function buildReverseRoute(string $routeKey, array $params): string
+    protected function buildReverseRoute(string $from, array $params): string
     {
         $locale = null;
 
         // Find all of our back-references in the original route
-        preg_match_all('/\(([^)]+)\)/', $routeKey, $matches);
+        preg_match_all('/\(([^)]+)\)/', $from, $matches);
 
         if (empty($matches[0])) {
-            if (strpos($routeKey, '{locale}') !== false) {
+            if (strpos($from, '{locale}') !== false) {
                 $locale = $params[0] ?? null;
             }
 
-            $routeKey = $this->replaceLocale($routeKey, $locale);
+            $from = $this->replaceLocale($from, $locale);
 
-            return '/' . ltrim($routeKey, '/');
+            return '/' . ltrim($from, '/');
         }
 
         // Locale is passed?
@@ -1336,25 +1339,34 @@ protected function buildReverseRoute(string $routeKey, array $params): string
 
         // Build our resulting string, inserting the $params in
         // the appropriate places.
-        foreach ($matches[0] as $index => $pattern) {
+        foreach ($matches[0] as $index => $placeholder) {
             if (! isset($params[$index])) {
                 throw new InvalidArgumentException(
-                    'Missing argument for "' . $pattern . '" in route "' . $routeKey . '".'
+                    'Missing argument for "' . $placeholder . '" in route "' . $from . '".'
                 );
             }
+
+            $placeholderName = substr($placeholder, 2, -1);
+            if (isset($this->placeholders[$placeholderName])) {
+                $pattern = $this->placeholders[$placeholderName];
+            } else {
+                // The $placeholder is not a placeholder. It is a regex.
+                $pattern = $placeholder;
+            }
+
             if (! preg_match('#^' . $pattern . '$#u', $params[$index])) {
                 throw RouterException::forInvalidParameterType();
             }
 
             // Ensure that the param we're inserting matches
             // the expected param type.
-            $pos      = strpos($routeKey, $pattern);
-            $routeKey = substr_replace($routeKey, $params[$index], $pos, strlen($pattern));
+            $pos  = strpos($from, $placeholder);
+            $from = substr_replace($from, $params[$index], $pos, strlen($placeholder));
         }
 
-        $routeKey = $this->replaceLocale($routeKey, $locale);
+        $from = $this->replaceLocale($from, $locale);
 
-        return '/' . ltrim($routeKey, '/');
+        return '/' . ltrim($from, '/');
     }
 
     /**

From a9e44f03f5403134a10abf05be0b63f59a95c56a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 11:28:15 +0900
Subject: [PATCH 26/36] refactor: remove uneeded variable and if statement

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

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 54f7e1d15c7b..8383280114b5 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1173,7 +1173,7 @@ public function reverseRoute(string $search, ...$params)
         // If it's not a named route, then loop over
         // all routes to find a match.
         foreach ($this->routes as $collection) {
-            foreach ($collection as $routeKey => $route) {
+            foreach ($collection as $route) {
                 $to   = $route['handler'];
                 $from = $route['from'];
 
@@ -1346,13 +1346,10 @@ protected function buildReverseRoute(string $from, array $params): string
                 );
             }
 
+            // Remove `(:` and `)` when $placeholder is a placeholder.
             $placeholderName = substr($placeholder, 2, -1);
-            if (isset($this->placeholders[$placeholderName])) {
-                $pattern = $this->placeholders[$placeholderName];
-            } else {
-                // The $placeholder is not a placeholder. It is a regex.
-                $pattern = $placeholder;
-            }
+            // or maybe $placeholder is not a placeholder, but a regex.
+            $pattern = $this->placeholders[$placeholderName] ?? $placeholder;
 
             if (! preg_match('#^' . $pattern . '$#u', $params[$index])) {
                 throw RouterException::forInvalidParameterType();

From 50cb4b4573c4d89dcbadd35bae1ae7a381c6c954 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 11:31:27 +0900
Subject: [PATCH 27/36] test: update assertion

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

diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index 85466b151a2e..4767dbf0cbfd 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -949,7 +949,7 @@ public function testUrlToWithRouteWithNestedParentheses(): void
     public function testUrlToMissingArgument(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Missing argument for "([a-zA-Z]+)" in route "([a-zA-Z]+)/login".');
+        $this->expectExceptionMessage('Missing argument for "(:alpha)" in route "(:alpha)/login".');
 
         $routes = Services::routes();
         $routes->group('(:alpha)', static function ($routes): void {

From a98c0a6114055232d82c090c3d88d1b6b705ac1d Mon Sep 17 00:00:00 2001
From: Simon Weber <s.weber@mpr-net.com>
Date: Wed, 30 Aug 2023 10:14:47 +0200
Subject: [PATCH 28/36] [DebugBar] make rotate class less broad

---
 admin/css/debug-toolbar/toolbar.scss   | 19 +++++++++----------
 system/Debug/Toolbar/Views/toolbar.css | 19 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index 01dfd2207b15..5d809874ebee 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -202,6 +202,15 @@
         // Give room for OS X scrollbar
         white-space: nowrap;
         z-index: 10000;
+        // Endless rotate
+        .rotate {
+            animation: toolbar-rotate 9s linear infinite;
+        }
+        @keyframes toolbar-rotate {
+            to {
+                transform: rotate(360deg);
+            }
+        }
     }
 
     // Fixed top
@@ -501,13 +510,3 @@
 .debug-bar-noverflow {
     overflow: hidden;
 }
-
-/* ENDLESS ROTATE */
-.rotate {
-    animation: rotate 9s linear infinite;
-}
-@keyframes rotate {
-    to {
-        transform: rotate(360deg);
-    }
-}
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 38bab087ae81..8a302b4019e9 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -140,6 +140,14 @@
   white-space: nowrap;
   z-index: 10000;
 }
+#debug-bar .toolbar .rotate {
+  animation: toolbar-rotate 9s linear infinite;
+}
+@keyframes toolbar-rotate {
+  to {
+    transform: rotate(360deg);
+  }
+}
 #debug-bar.fixed-top {
   bottom: auto;
   top: 0;
@@ -796,14 +804,3 @@
 .debug-bar-noverflow {
   overflow: hidden;
 }
-
-/* ENDLESS ROTATE */
-.rotate {
-  animation: rotate 9s linear infinite;
-}
-
-@keyframes rotate {
-  to {
-    transform: rotate(360deg);
-  }
-}

From c5fee4389c153e733604f20dd1fed0bb1b73ce99 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 18:30:33 +0900
Subject: [PATCH 29/36] docs: fix doc comments

---
 app/Config/Email.php   | 6 +++++-
 system/Email/Email.php | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Config/Email.php b/app/Config/Email.php
index 01350186a3e9..01b805a5c1fa 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -56,7 +56,11 @@ class Email extends BaseConfig
     public bool $SMTPKeepAlive = false;
 
     /**
-     * SMTP Encryption. Either tls or ssl
+     * SMTP Encryption.
+     *
+     * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
+     *             to the server. 'ssl' means implicit SSL. Connection on port
+     *             465 should set this to ''.
      */
     public string $SMTPCrypto = 'tls';
 
diff --git a/system/Email/Email.php b/system/Email/Email.php
index d962042d5e7a..e73e802cf93f 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -113,7 +113,9 @@ class Email
     /**
      * SMTP Encryption
      *
-     * @var string Empty, 'tls' or 'ssl'
+     * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
+     *             to the server. 'ssl' means implicit SSL. Connection on port
+     *             465 should set this to ''.
      */
     public $SMTPCrypto = '';
 

From a5b4f9bf85eae3999fe7e31b150e65dad0a60724 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 18:30:51 +0900
Subject: [PATCH 30/36] fix: now you can use SSL with port 465

But it is not recommended.
---
 system/Email/Email.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/Email/Email.php b/system/Email/Email.php
index e73e802cf93f..b2f6874c32c9 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1870,9 +1870,13 @@ protected function SMTPConnect()
 
         $ssl = '';
 
+        // Connection to port 465 should use implicit TLS (without STARTTLS)
+        // as per RFC 8314.
         if ($this->SMTPPort === 465) {
             $ssl = 'tls://';
-        } elseif ($this->SMTPCrypto === 'ssl') {
+        }
+        // But if $SMTPCrypto is set to `ssl`, SSL can be used.
+        if ($this->SMTPCrypto === 'ssl') {
             $ssl = 'ssl://';
         }
 

From 2d0fa2e6e819ce83ea466f77d7d465343bc1371b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Aug 2023 18:32:01 +0900
Subject: [PATCH 31/36] docs: improve descriptions

---
 user_guide_src/source/libraries/email.rst | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 0e0b949e1dde..1112205ea352 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -66,6 +66,8 @@ Email properties. Then save the file and it will be used automatically.
 You will NOT need to use the ``$email->initialize()`` method if
 you set your preferences in the config file.
 
+.. _email-ssl-tls-for-smtp:
+
 SSL versus TLS for SMTP Protocol
 --------------------------------
 
@@ -85,7 +87,7 @@ will upgrade the channel to use encryption using the ``STARTTLS`` SMTP command.
 
 Upgrading a connection on port 465 may or may not be supported by the server, so the
 ``STARTTLS`` SMTP command may fail if the server does not allow it. If you set the port to 465,
-you should try to leave the ``SMTPCrypto`` setting blank since the communication is
+you should try to set the ``SMTPCrypto`` to an empty string (``''``) since the communication is
 secured using TLS from the start and the ``STARTTLS`` is not needed.
 
 If your configuration requires you to connect to port 587, you should most likely set
@@ -115,14 +117,15 @@ Preference          Default Value          Options                      Descript
 **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.)
+**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**      No Default             tls or ssl                   SMTP Encryption. Setting this to "ssl" will create a secure
-                                                                        channel to the server using SSL and "tls" will issue a
+**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 blank.
+                                                                        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

From fe40d947f010e808b8549c558f31668907cf54fb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Sep 2023 06:03:24 +0900
Subject: [PATCH 32/36] test: add test for forceGlobalSecureRequests

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

diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index aee912281c76..9b7b8eed0081 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -15,6 +15,8 @@
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Response;
+use CodeIgniter\Test\Mock\MockCodeIgniter;
+use Config\App;
 use Config\Routing;
 use Config\Services;
 
@@ -629,4 +631,19 @@ public function testAutoRoutingLegacy()
 
         $response->assertOK();
     }
+
+    public function testForceGlobalSecureRequests()
+    {
+        $config                            = config(App::class);
+        $config->forceGlobalSecureRequests = true;
+        Factories::injectMock('config', App::class, $config);
+
+        $this->app = new MockCodeIgniter($config);
+        $this->app->initialize();
+
+        $response = $this->get('/');
+
+        // Do not redirect.
+        $response->assertStatus(200);
+    }
 }

From c8fc3d8eeb086e608c100a76a76438f6171a945d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Sep 2023 06:03:45 +0900
Subject: [PATCH 33/36] fix: HTTP tests fail when forceGlobalSecureRequests is
 true

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

diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 8243d806bcbc..063a7eec73fa 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -292,6 +292,9 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR
 
         if ($config->forceGlobalSecureRequests) {
             $_SERVER['HTTPS'] = 'test';
+            $server           = $request->getServer();
+            $server['HTTPS']  = 'test';
+            $request->setGlobal('server', $server);
         }
 
         return $request;

From 28c71eb11f409f8a0f93e0991d8a5cc2acbf861a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 15:17:26 +0000
Subject: [PATCH 34/36] build(deps): bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy-apidocs.yml               |  4 ++--
 .github/workflows/deploy-distributables.yml        | 14 +++++++-------
 .github/workflows/deploy-userguide-latest.yml      |  2 +-
 .github/workflows/reusable-coveralls.yml           |  2 +-
 .github/workflows/reusable-phpunit-test.yml        |  2 +-
 .../reusable-serviceless-phpunit-test.yml          |  2 +-
 .github/workflows/test-autoreview.yml              |  2 +-
 .github/workflows/test-coding-standards.yml        |  2 +-
 .github/workflows/test-deptrac.yml                 |  2 +-
 .github/workflows/test-phpcpd.yml                  |  2 +-
 .github/workflows/test-phpstan.yml                 |  2 +-
 .github/workflows/test-psalm.yml                   |  2 +-
 .github/workflows/test-rector.yml                  |  2 +-
 .github/workflows/test-scss.yml                    |  2 +-
 .github/workflows/test-userguide.yml               |  2 +-
 15 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 5675963ea24f..cc7015200e13 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -29,12 +29,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/api
           token: ${{ secrets.ACCESS_TOKEN }}
diff --git a/.github/workflows/deploy-distributables.yml b/.github/workflows/deploy-distributables.yml
index e279abad2dd7..3d4b31f289e6 100644
--- a/.github/workflows/deploy-distributables.yml
+++ b/.github/workflows/deploy-distributables.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # fetch all tags
 
@@ -48,12 +48,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/framework
           token: ${{ secrets.ACCESS_TOKEN }}
@@ -98,12 +98,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/appstarter
           token: ${{ secrets.ACCESS_TOKEN }}
@@ -148,12 +148,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/userguide
           token: ${{ secrets.ACCESS_TOKEN }}
diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml
index 58e5e731ed18..ab366268e5ee 100644
--- a/.github/workflows/deploy-userguide-latest.yml
+++ b/.github/workflows/deploy-userguide-latest.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml
index 984b657a623e..f545d79bb5ec 100644
--- a/.github/workflows/reusable-coveralls.yml
+++ b/.github/workflows/reusable-coveralls.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
index bea8e4c3bee6..0963f5865242 100644
--- a/.github/workflows/reusable-phpunit-test.yml
+++ b/.github/workflows/reusable-phpunit-test.yml
@@ -149,7 +149,7 @@ jobs:
           sudo apt-get install --fix-broken
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
index c044f2178ea3..6371847c77bd 100644
--- a/.github/workflows/reusable-serviceless-phpunit-test.yml
+++ b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -61,7 +61,7 @@ jobs:
           sudo apt-get install --fix-broken
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
index 21f885445b63..44feb4e33139 100644
--- a/.github/workflows/test-autoreview.yml
+++ b/.github/workflows/test-autoreview.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index a38e3ab85cd9..9217f48bb127 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
index e6b92346972b..b92f861c790c 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index f08945514386..53daa8ebab95 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index 8e2a57685cba..3ab82f25c762 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-psalm.yml b/.github/workflows/test-psalm.yml
index da7c6e422745..62e65bf7a866 100644
--- a/.github/workflows/test-psalm.yml
+++ b/.github/workflows/test-psalm.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 7df4a3a3d3ed..7912a59f5d3f 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -53,7 +53,7 @@ jobs:
           - utils
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-scss.yml b/.github/workflows/test-scss.yml
index 26a679719156..417eede8f344 100644
--- a/.github/workflows/test-scss.yml
+++ b/.github/workflows/test-scss.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
         uses: actions/setup-node@v3.0.0
diff --git a/.github/workflows/test-userguide.yml b/.github/workflows/test-userguide.yml
index b188080996db..b127d77dd344 100644
--- a/.github/workflows/test-userguide.yml
+++ b/.github/workflows/test-userguide.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Detect usage of tabs in RST files
         run: php utils/check_tabs_in_rst.php

From 01a12b1035228028093961d162ef28a4ffa66eb4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 29 Aug 2023 15:46:08 +0900
Subject: [PATCH 35/36] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.4.1.rst b/user_guide_src/source/changelogs/v4.4.1.rst
index b3d229aa210c..3c90b408872c 100644
--- a/user_guide_src/source/changelogs/v4.4.1.rst
+++ b/user_guide_src/source/changelogs/v4.4.1.rst
@@ -24,6 +24,11 @@ Deprecations
 Bugs Fixed
 **********
 
+- **AutoRouting Legacy:** Fixed a bug that Auto Routing Legacy does not work.
+- **FeatureTest:**
+    - Fixed a bug that FeatureTest may cause risky tests.
+    - Fixed a bug that FeatureTest fails when forceGlobalSecureRequests is true.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.

From 228ece2f97c02a07d87133482d6aa2ccc13ffe0a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 29 Aug 2023 15:43:35 +0900
Subject: [PATCH 36/36] Prep for 4.4.1 release

---
 CHANGELOG.md                                  | 15 +++++++++++
 system/CodeIgniter.php                        |  2 +-
 user_guide_src/source/changelogs/v4.4.1.rst   | 14 +----------
 user_guide_src/source/conf.py                 |  2 +-
 .../source/installation/upgrade_441.rst       | 25 ++++++-------------
 5 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59da5951f9a4..dc2b5bc5640c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [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)
+
+### Fixed Bugs
+
+* docs: add missing Config updates for Hot Reloading by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7862
+* fix: auto route legacy does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7871
+* fix: Factories may not return shared instance by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7868
+* fix: replace `config(DocTypes::class)` with `new DocTypes()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7872
+* fix: FeatureTest may cause risky tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7867
+* fix: reverse routing causes ErrorException by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7880
+* fix: Email library forces to switch to TLS when setting port 465 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7883
+* fix: [DebugBar] make CSS rotate class less broad by @sanchawebo in https://github.com/codeigniter4/CodeIgniter4/pull/7882
+* fix: FeatureTest fails when forceGlobalSecureRequests is true by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7890
+
 ## [v4.4.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.0) (2023-08-25)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.8...v4.4.0)
 
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index e991af8de121..6ef3ab8261b2 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -52,7 +52,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.4.0';
+    public const CI_VERSION = '4.4.1';
 
     /**
      * App startup time.
diff --git a/user_guide_src/source/changelogs/v4.4.1.rst b/user_guide_src/source/changelogs/v4.4.1.rst
index 3c90b408872c..b6c92affc8fd 100644
--- a/user_guide_src/source/changelogs/v4.4.1.rst
+++ b/user_guide_src/source/changelogs/v4.4.1.rst
@@ -1,7 +1,7 @@
 Version 4.4.1
 #############
 
-Release Date: Unreleased
+Release Date: September 5, 2023
 
 **4.4.1 release of CodeIgniter4**
 
@@ -9,18 +9,6 @@ Release Date: Unreleased
     :local:
     :depth: 3
 
-BREAKING
-********
-
-Message Changes
-***************
-
-Changes
-*******
-
-Deprecations
-************
-
 Bugs Fixed
 **********
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 7c940ea991e8..a456e6a937a4 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.0'
+release = '4.4.1'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_441.rst b/user_guide_src/source/installation/upgrade_441.rst
index 9824405edb37..c2fc56859f11 100644
--- a/user_guide_src/source/installation/upgrade_441.rst
+++ b/user_guide_src/source/installation/upgrade_441.rst
@@ -12,15 +12,6 @@ Please refer to the upgrade instructions corresponding to your installation meth
     :local:
     :depth: 2
 
-Mandatory File Changes
-**********************
-
-Breaking Changes
-****************
-
-Breaking Enhancements
-*********************
-
 Project Files
 *************
 
@@ -33,13 +24,7 @@ the project space: `Explore on Packagist <https://packagist.org/explore/?query=c
 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
+Version 4.4.1 did not alter any executable code in project files.
 
 All Changes
 ===========
@@ -47,4 +32,10 @@ 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/Autoload.php
+- app/Config/DocTypes.php
+- app/Config/Email.php
+- app/Config/ForeignCharacters.php
+- app/Config/Mimes.php
+- app/Config/Modules.php
+- composer.json